diff options
Diffstat (limited to 'csharp/src/Ice/PluginManagerI.cs')
| -rw-r--r-- | csharp/src/Ice/PluginManagerI.cs | 44 |
1 files changed, 4 insertions, 40 deletions
diff --git a/csharp/src/Ice/PluginManagerI.cs b/csharp/src/Ice/PluginManagerI.cs index 3f0009bbaba..692d18ac8da 100644 --- a/csharp/src/Ice/PluginManagerI.cs +++ b/csharp/src/Ice/PluginManagerI.cs @@ -7,7 +7,6 @@ // // ********************************************************************** -#if !SILVERLIGHT namespace Ice { using System; @@ -57,15 +56,13 @@ namespace Ice { p.plugin.initialize(); } - catch(PluginInitializationException ex) + catch(PluginInitializationException) { - throw ex; + throw; } catch(System.Exception ex) { - PluginInitializationException e = new PluginInitializationException(ex); - e.reason = "plugin `" + p.name + "' initialization failed"; - throw e; + throw new PluginInitializationException(String.Format("plugin `{0}' initialization failed", p.name), ex); } initializedPlugins.Add(p.plugin); } @@ -405,37 +402,6 @@ namespace Ice } catch(System.Exception ex) { -#if COMPACT - // - // IceSSL is not supported with the Compact Framework. - // - if(name == "IceSSL") - { - if(!_sslWarnOnce) - { - _communicator.getLogger().warning( - "IceSSL plug-in not loaded: IceSSL is not supported with the .NET Compact Framework"); - _sslWarnOnce = true; - } - return; - } -#else - // - // IceSSL is not yet supported with Mono. We avoid throwing an exception in that case, - // so the same configuration can be used with Mono or Visual C#. - // - if(IceInternal.AssemblyUtil.runtime_ == IceInternal.AssemblyUtil.Runtime.Mono && name == "IceSSL") - { - if(!_sslWarnOnce) - { - _communicator.getLogger().warning( - "IceSSL plug-in not loaded: IceSSL is not supported with Mono"); - _sslWarnOnce = true; - } - return; - } -#endif - PluginInitializationException e = new PluginInitializationException(); e.reason = err + "unable to load assembly: `" + assemblyName + "': " + ex.ToString(); throw e; @@ -494,7 +460,7 @@ namespace Ice catch(PluginInitializationException ex) { ex.reason = err + ex.reason; - throw ex; + throw; } catch(System.Exception ex) { @@ -537,7 +503,5 @@ namespace Ice private Communicator _communicator; private ArrayList _plugins; private bool _initialized; - private static bool _sslWarnOnce = false; } } -#endif |