2010-02-03 Jonathan Pobst <monkey@jpobst.com>

[mono.git] / mcs / class / System.Runtime.Remoting / System.Runtime.Remoting.Channels / SoapClientFormatterSink.cs

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapClientFormatterSink.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapClientFormatterSink.cs
index a1cdbd5beb467efc741d1356049a40fa872e479b..88058e6fb4c87b4747ea0a82a6d6973688859fa9 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapClientFormatterSink.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapClientFormatterSink.cs
@@ -44,36 +44,32 @@ namespace System.Runtime.Remoting.Channels
                private IClientChannelSink _nextChannelSink;\r
                private SoapCore _soapCore = SoapCore.DefaultInstance;\r
 \r
-               public SoapClientFormatterSink (IClientChannelSink sink)\r
+               public SoapClientFormatterSink (IClientChannelSink nextSink)\r
                {\r
-                       _nextChannelSink = sink;\r
+                       _nextChannelSink = nextSink;\r
                }\r
                \r
-               internal SoapCore SoapCore\r
-               {\r
+               internal SoapCore SoapCore {\r
                        get { return _soapCore; }\r
                        set { _soapCore = value; }\r
                }\r
                \r
                // IClientChannelSink\r
-               public IClientChannelSink NextChannelSink\r
-               {\r
+               public IClientChannelSink NextChannelSink {\r
                        get {\r
                                return _nextChannelSink;\r
                        }\r
                }\r
                \r
                // IMessageSink\r
-               public IMessageSink NextSink\r
-               {\r
+               public IMessageSink NextSink {\r
                        get {\r
                                return null ;\r
                        }\r
                }\r
                \r
                // IChannelSinkBase\r
-               public IDictionary Properties\r
-               {\r
+               public IDictionary Properties {\r
                        get {\r
                                return null;\r
                        }\r
@@ -86,12 +82,13 @@ namespace System.Runtime.Remoting.Channels
                        ITransportHeaders requestHeaders;\r
                        SoapMessageFormatter soapMsgFormatter;\r
                        \r
-                       SerializeMessage(msg, out requestStream, out requestHeaders, out soapMsgFormatter);\r
+                       SerializeMessage (msg, out requestStream, out requestHeaders,\r
+                               out soapMsgFormatter);\r
 \r
-                       ClientChannelSinkStack stack = new ClientChannelSinkStack(replySink);\r
+                       ClientChannelSinkStack stack = new ClientChannelSinkStack (replySink);\r
                        stack.Push(this, new CallData (msg, soapMsgFormatter));\r
 \r
-                       _nextChannelSink.AsyncProcessRequest(stack, msg, requestHeaders, requestStream);\r
+                       _nextChannelSink.AsyncProcessRequest (stack, msg, requestHeaders, requestStream);\r
 \r
                        return null;\r
                }\r
@@ -110,10 +107,12 @@ namespace System.Runtime.Remoting.Channels
                                                  ITransportHeaders headers,\r
                                                  Stream stream)\r
                {\r
-                       CallData data = (CallData)state;\r
+                       CallData data = (CallData) state;\r
                        SoapMessageFormatter soapMsgFormatter = data.Formatter;\r
-                       IMessage replyMessage = (IMessage) DeserializeMessage(stream, headers, (IMethodCallMessage)data.Msg, soapMsgFormatter);\r
-                       sinkStack.DispatchReplyMessage(replyMessage);\r
+                       IMessage replyMessage = (IMessage) DeserializeMessage (\r
+                               stream, headers, (IMethodCallMessage) data.Msg,\r
+                               soapMsgFormatter);\r
+                       sinkStack.DispatchReplyMessage (replyMessage);\r
                        \r
                }\r
 \r
@@ -142,30 +141,36 @@ namespace System.Runtime.Remoting.Channels
                        Stream requestStream, responseStream;\r
                        ITransportHeaders requestHeaders, responseHeaders;\r
                        SoapMessageFormatter soapMsgFormatter;\r
-                       \r
-                       SerializeMessage(msg, out requestStream, out requestHeaders, out soapMsgFormatter);\r
-                       _nextChannelSink.ProcessMessage(msg, requestHeaders, requestStream, out responseHeaders, out responseStream);\r
 \r
-                       return DeserializeMessage(responseStream, responseHeaders, (IMethodCallMessage)msg, soapMsgFormatter);\r
+                       SerializeMessage (msg, out requestStream, out requestHeaders,\r
+                               out soapMsgFormatter);\r
+                       _nextChannelSink.ProcessMessage(msg, requestHeaders,\r
+                               requestStream, out responseHeaders,\r
+                               out responseStream);\r
+\r
+                       return DeserializeMessage(responseStream, responseHeaders,\r
+                               (IMethodCallMessage) msg, soapMsgFormatter);\r
                }\r
                \r
                \r
                private void SerializeMessage(IMessage msg, out Stream requestStream, out ITransportHeaders requestHeaders, out SoapMessageFormatter soapMsgFormatter) {\r
                        SoapMessage soapMsg;\r
                        soapMsgFormatter = new SoapMessageFormatter();\r
-                       soapMsg = soapMsgFormatter.BuildSoapMessageFromMethodCall((IMethodCallMessage) msg, out requestHeaders);\r
-                       \r
+                       soapMsg = soapMsgFormatter.BuildSoapMessageFromMethodCall (\r
+                               (IMethodCallMessage) msg, out requestHeaders);\r
+\r
                        // Get the stream where the message will be serialized\r
-                       requestStream = _nextChannelSink.GetRequestStream(msg, requestHeaders);\r
-                       \r
-                       if(requestStream == null) requestStream = new MemoryStream();\r
-                       \r
+                       requestStream = _nextChannelSink.GetRequestStream (msg,\r
+                               requestHeaders);\r
+\r
+                       if (requestStream == null)\r
+                               requestStream = new MemoryStream();\r
+\r
                        // Serialize the message into the stream\r
                        _soapCore.Serializer.Serialize(requestStream, soapMsg, null);\r
-                       \r
-                       if(requestStream is MemoryStream){\r
+\r
+                       if (requestStream is MemoryStream)\r
                                requestStream.Position = 0;\r
-                       }\r
                }\r
                \r
                \r
@@ -176,7 +181,7 @@ namespace System.Runtime.Remoting.Channels
                        fm.TopObject = rtnMessage;\r
                        object objReturn = fm.Deserialize(responseStream);\r
 \r
-                       if (objReturn is SoapFault) \r
+                       if (objReturn is SoapFault)\r
                                return soapMsgFormatter.FormatFault ((SoapFault) objReturn, mcm);\r
                        else\r
                                return soapMsgFormatter.FormatResponse ((ISoapMessage) objReturn, mcm);\r
@@ -184,7 +189,12 @@ namespace System.Runtime.Remoting.Channels
 \r
                class CallData\r
                {\r
-                       public CallData (IMessage msg, SoapMessageFormatter formatter) { Msg = msg; Formatter = formatter; }\r
+                       public CallData (IMessage msg, SoapMessageFormatter formatter)\r
+                       {\r
+                               Msg = msg;\r
+                               Formatter = formatter;\r
+                       }\r
+\r
                        public IMessage Msg;\r
                        public SoapMessageFormatter Formatter;\r
                }\r