X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FSystem.Runtime.Serialization.Formatters.Binary%2FMessageFormatter.cs;h=8347f04482343753eb869167295202084d2caa72;hb=9e3370d3351358044231dd1f3df5fff3720bdcc2;hp=78cecd18c75529caaf2c62975005f6f67dee8d0c;hpb=f22dc5eae70276a2d8a68cb1182585c59af18170;p=mono.git

diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/MessageFormatter.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/MessageFormatter.cs
index 78cecd18c75..8347f044823 100644
--- a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/MessageFormatter.cs
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/MessageFormatter.cs
@@ -5,6 +5,29 @@
 //
 // (C) 2003, Lluis Sanchez Gual
 //
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
 
 using System;
 using System.IO;
@@ -171,7 +194,7 @@ namespace System.Runtime.Serialization.Formatters.Binary
 				formatFlag = MethodFlags.NoArguments;
 			else 
 			{
-				if (AllTypesArePrimitive (resp.OutArgs)) 
+				if (AllTypesArePrimitive (resp.Args)) 
 					formatFlag = MethodFlags.PrimitiveArguments;
 				else 
 				{
@@ -201,10 +224,10 @@ namespace System.Runtime.Serialization.Formatters.Binary
 
 			if (formatFlag == MethodFlags.PrimitiveArguments)
 			{
-				writer.Write ((uint)resp.OutArgCount);
-				for (int n=0; n<resp.OutArgCount; n++)
+				writer.Write ((uint)resp.ArgCount);
+				for (int n=0; n<resp.ArgCount; n++)
 				{
-					object val = resp.GetOutArg(n);
+					object val = resp.GetArg(n);
 					if (val != null) {
 						writer.Write (BinaryCommon.GetTypeCode (val.GetType()));
 						ObjectWriter.WritePrimitiveValue (writer, val);
@@ -220,7 +243,7 @@ namespace System.Runtime.Serialization.Formatters.Binary
 				int n = 0;
 
 				if (formatFlag == MethodFlags.ArgumentsInMultiArray)
-					infoArray[n++] = resp.OutArgs;
+					infoArray[n++] = resp.Args;
 
 				if (returnTypeTag == ReturnTypeTag.ObjectType)
 					infoArray[n++] = resp.ReturnValue;
@@ -234,7 +257,7 @@ namespace System.Runtime.Serialization.Formatters.Binary
 				info = infoArray;
 			}
 			else if ((formatFlag & MethodFlags.ArgumentsInSimpleArray) > 0)
-				info = resp.OutArgs;
+				info = resp.Args;
 
 			if (info != null)
 			{
@@ -263,7 +286,7 @@ namespace System.Runtime.Serialization.Formatters.Binary
 			if (((BinaryTypeCode)reader.ReadByte()) != BinaryTypeCode.String) throw new SerializationException ("Invalid format");
 			string className = reader.ReadString();
 
-			bool hasContextInfo = (flags & MethodFlags.IncludesLogicalCallContext) > 0;
+			//bool hasContextInfo = (flags & MethodFlags.IncludesLogicalCallContext) > 0;
 
 			object[] arguments = null;
 			object methodSignature = null;