Merge pull request #2417 from razzfazz/guard_substr

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

diff --git a/mcs/class/corlib/System.Runtime.Remoting/WellKnownServiceTypeEntry.cs b/mcs/class/corlib/System.Runtime.Remoting/WellKnownServiceTypeEntry.cs
index 85a26832556ecc4728827de0789febfcd94b979f..74c8820d067f034aaebf978c13ad01e193b51f36 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/WellKnownServiceTypeEntry.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting/WellKnownServiceTypeEntry.cs
@@ -6,12 +6,36 @@
 // 2002 (C) Copyright. Ximian, 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.Runtime.Remoting.Contexts;
 
 namespace System.Runtime.Remoting {
 
+       [System.Runtime.InteropServices.ComVisible (true)]
        public class WellKnownServiceTypeEntry : TypeEntry
        {
                Type obj_type;
@@ -36,6 +60,8 @@ namespace System.Runtime.Remoting {
                        obj_type = a.GetType (typeName);
                        obj_uri = objectUri;
                        obj_mode = mode;
+                       if (obj_type == null) 
+                               throw new RemotingException ("Type not found: " + typeName + ", " + assemblyName);
                }
 
                public IContextAttribute [] ContextAttributes {
@@ -45,7 +71,6 @@ namespace System.Runtime.Remoting {
 
                public WellKnownObjectMode Mode {
                        get { return obj_mode; }
-                       set { obj_mode = value; }
                }
 
                public Type ObjectType {
@@ -54,13 +79,11 @@ namespace System.Runtime.Remoting {
 
                public string ObjectUri {
                        get { return obj_uri; }
-                       set { obj_uri = value; }
                }
 
-               [MonoTODO]
                public override string ToString ()
                {
-                       return TypeName + AssemblyName + ObjectUri;
+                       return TypeName + ", " + AssemblyName + " " + ObjectUri;
                }
        }
 }