2005-10-17 Lluis Sanchez Gual <lluis@novell.com>

	* RemotingConfiguration.cs: Rethrow catched exceptions
	in ReadConfigFile (patch by Robert Jordan). Fixes bug #76434.
	Properly set the application name.

2005-08-18  Lluis Sanchez Gual  <lluis@novell.com>

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

diff --git a/mcs/class/corlib/System.Runtime.Remoting/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
index 67aa57c2522c84e6526af8c0f45ba290d07e901c..a8f4b7c52fb8d31658679aa0b7bc2176ef12bc5a 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
@@ -1,4 +1,10 @@
-2004-08-18  Lluis Sanchez Gual  <lluis@novell.com>
+2005-10-17  Lluis Sanchez Gual  <lluis@novell.com>
+
+       * RemotingConfiguration.cs: Rethrow catched exceptions
+       in ReadConfigFile (patch by Robert Jordan). Fixes bug #76434.
+       Properly set the application name.
+
+2005-08-18  Lluis Sanchez Gual  <lluis@novell.com>
 
        * RemotingServices.cs: Notify marshals, unmarshals and disconnections
        to TrackingServices. Fixes bug #75814.

diff --git a/mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs b/mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs
index 7d861b0401257d9d5d2bb0cddeca6bea387ff84c..d8b5f1dc763515a29a99173da3471ad4b47752c0 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs
@@ -73,24 +73,15 @@ namespace System.Runtime.Remoting
                public static string ApplicationId 
                {
                        get 
-                       { 
-                               applicationID = AppDomain.CurrentDomain.SetupInformation.ApplicationName; 
+                       {
+                               applicationID = ApplicationName; 
                                return applicationID;
                        }
                }
                
                public static string ApplicationName 
                {
-                       get { 
-                               try {
-                                       applicationName = AppDomain.CurrentDomain.SetupInformation.ApplicationName; 
-                               }
-                               catch (Exception e) {
-                                       throw e;
-                               }
-                               // We return null if the application name has not been set.
-                               return null;
-                       }
+                       get { return applicationName; }
                        set { applicationName = value; }
                }
                
@@ -134,7 +125,7 @@ namespace System.Runtime.Remoting
                        }
                        catch (Exception ex)
                        {
-                               throw new RemotingException ("Configuration file '" + filename + "' could not be loaded: " + ex.Message);
+                               throw new RemotingException ("Configuration file '" + filename + "' could not be loaded: " + ex.Message, ex);
                        }
                }
                
@@ -439,7 +430,7 @@ namespace System.Runtime.Remoting
                        }
                        catch (Exception ex)
                        {
-                               throw new RemotingException ("Error in element " + name + ": " + ex.Message);
+                               throw new RemotingException ("Error in element " + name + ": " + ex.Message, ex);
                        }
                }