diff options
| author | Boris Kirzner <borisk@mono-cvs.ximian.com> | 2005-07-26 21:43:44 +0400 |
|---|---|---|
| committer | Boris Kirzner <borisk@mono-cvs.ximian.com> | 2005-07-26 21:43:44 +0400 |
| commit | aa74b38603ae6b94d2feaa8c7cd0be987bbdc6c7 (patch) | |
| tree | ac2a3d2548d65372584bae6200a7e71278e4aa94 /mcs/class/Novell.Directory.Ldap | |
| parent | c59049ad050e5815911bb28ba0acbd0aa1f52b8b (diff) | |
Fix LdapException treat of inner exceptions.
svn path=/trunk/mcs/; revision=47715
Diffstat (limited to 'mcs/class/Novell.Directory.Ldap')
| -rw-r--r-- | mcs/class/Novell.Directory.Ldap/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/LdapException.cs | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/mcs/class/Novell.Directory.Ldap/ChangeLog b/mcs/class/Novell.Directory.Ldap/ChangeLog index 6386dbe25cb..1989a731eef 100644 --- a/mcs/class/Novell.Directory.Ldap/ChangeLog +++ b/mcs/class/Novell.Directory.Ldap/ChangeLog @@ -1,4 +1,8 @@ 2005-26-07 Boris Kirzner <borisk@mainsoft.com> + * Novell.Directory.Ldap/LdapException.cs: propagate root cause exception + to base. Use InnerException instead of private member. + +2005-26-07 Boris Kirzner <borisk@mainsoft.com> * Novell.Directory.Ldap/AssemblyInfo.cs, Novell.Directory.Ldap.Asn1/Asn1Enumerated.cs, Novell.Directory.Ldap.Asn1/Asn1Choice.cs, diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/LdapException.cs b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/LdapException.cs index cae6d608eb2..99bf0c011bd 100644 --- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/LdapException.cs +++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/LdapException.cs @@ -180,7 +180,7 @@ namespace Novell.Directory.Ldap { get { - return rootException; + return InnerException; } } @@ -251,8 +251,6 @@ namespace Novell.Directory.Ldap private System.Object[] arguments = null; // The Matched DN private System.String matchedDN = null; - // The Root Cause - private System.Exception rootException = null; // A message from the server private System.String serverMessage = null; @@ -1002,14 +1000,13 @@ namespace Novell.Directory.Ldap /// be matched by the server on a search operation. /// </param> /* package */ - internal LdapException(System.String messageOrKey, System.Object[] arguments, int resultCode, System.String serverMsg, System.String matchedDN, System.Exception rootException) + internal LdapException(System.String messageOrKey, System.Object[] arguments, int resultCode, System.String serverMsg, System.String matchedDN, System.Exception rootException):base(messageOrKey, rootException) //:base(Novell.Directory.Ldap.Utilclass.ResourcesHandler.getMessage(messageOrKey, arguments)) //Once resorcehandler starts working properly need to uncomment { this.messageOrKey = messageOrKey; this.arguments = arguments; this.resultCode = resultCode; - this.rootException = rootException; this.matchedDN = matchedDN; this.serverMessage = serverMsg; return ; @@ -1132,9 +1129,9 @@ namespace Novell.Directory.Ldap msg = msg + '\n' + tmsg; } - if (rootException != null) + if (InnerException != null) { - msg = msg + '\n' + rootException.ToString(); + msg = msg + '\n' + InnerException.ToString(); } return msg; } |