* MethodResponse.cs, ReturnMessage.cs: More null checks.

svn path=/trunk/mcs/; revision=26581

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog
index 09e912d867b9630086ad3fcf778610cdbbf63859..8b1df7324df4d5b4283b9aca902c7605987b9588 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-03  Lluis Sanchez Gual  <lluis@ximian.com>
+
+       * MethodResponse.cs, ReturnMessage.cs: More null checks.
+
 2004-04-30  Lluis Sanchez Gual  <lluis@ximian.com>
 
        * MethodResponse.cs, ReturnMessage.cs: Added null checks.

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs
index e0add22818f30d4c7b8777da14bd0668bdcc03b9..3cd83a0a8d267ab6b585772864ac0278024dca6a 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs
@@ -193,7 +193,7 @@ namespace System.Runtime.Remoting.Messaging {
 
                public object[] OutArgs {
                        get { 
-                               if (_outArgs == null) {
+                               if (_outArgs == null && _args != null) {
                                        if (_inArgInfo == null) _inArgInfo = new ArgInfo (MethodBase, ArgInfoType.Out);
                                        _outArgs = _inArgInfo.GetInOutArgs (_args);
                                }                                       

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs
index dc9371f02d59fbead8cb553ef4736d2a02e98dbe..10c28b8af30b25572a8277117d6e534117b1d52b 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs
@@ -156,7 +156,7 @@ namespace System.Runtime.Remoting.Messaging {
 
                public object [] OutArgs {
                        get {
-                               if (_outArgs == null) {
+                               if (_outArgs == null && _args != null) {
                                        if (_inArgInfo == null) _inArgInfo = new ArgInfo (MethodBase, ArgInfoType.Out);
                                        _outArgs = _inArgInfo.GetInOutArgs (_args);
                                }