Merge pull request #2780 from alexanderkyte/seq_point_optimize

[mono.git] / mcs / class / corlib / System.Runtime.Remoting / InternalRemotingServices.cs

diff --git a/mcs/class/corlib/System.Runtime.Remoting/InternalRemotingServices.cs b/mcs/class/corlib/System.Runtime.Remoting/InternalRemotingServices.cs
index 122d88d35a26328e52c33f9bbba69a7a73a22429..5ee13c90c62d6385d7fa36beac29c19ad2087438 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/InternalRemotingServices.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting/InternalRemotingServices.cs
@@ -7,6 +7,29 @@
 // (C) 2003 Novell, Inc.
 //
 
+//
+// 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.Reflection;
 using System.Diagnostics;
@@ -16,9 +39,10 @@ using System.Runtime.Remoting.Messaging;
 
 namespace System.Runtime.Remoting
 {
+       [System.Runtime.InteropServices.ComVisible (true)]
        public class InternalRemotingServices 
        {
-               static Hashtable _soapAttributes;
+               static Hashtable _soapAttributes = new Hashtable ();
                
                public InternalRemotingServices ()
                {
@@ -32,26 +56,28 @@ namespace System.Runtime.Remoting
                }
                
                public static SoapAttribute GetCachedSoapAttribute (object reflectionObject)
-               {
-                       if (_soapAttributes == null)
-                       {
-                               lock (typeof(InternalRemotingServices))
-                               {
-                                       if (_soapAttributes == null)
-                                               _soapAttributes = new Hashtable ();
-                               }
-                       }
-                       
-                       lock (_soapAttributes.SyncRoot)
-                       {
+               {                       
+                       lock (_soapAttributes.SyncRoot) {
                                SoapAttribute att = _soapAttributes [reflectionObject] as SoapAttribute;
                                if (att != null) return att;
                                
                                ICustomAttributeProvider ap = (ICustomAttributeProvider) reflectionObject;
                                object[] atts = ap.GetCustomAttributes (typeof(SoapAttribute), true);
-                               if (atts.Length > 0) att = (SoapAttribute) atts[0];
-                               else att = null;
+                               if (atts.Length > 0) 
+                                       att = (SoapAttribute) atts[0];
+                               else
+                               {
+                                       if (reflectionObject is Type)
+                                               att = new SoapTypeAttribute ();
+                                       else if (reflectionObject is FieldInfo)
+                                               att = new SoapFieldAttribute ();
+                                       else if (reflectionObject is MethodBase)
+                                               att = new SoapMethodAttribute ();
+                                       else if (reflectionObject is ParameterInfo)
+                                               att = new SoapParameterAttribute ();
+                               }
                                
+                               att.SetReflectionObject (reflectionObject);
                                _soapAttributes [reflectionObject] = att;
                                return att;
                        }