diff options
author | Jose <jose@zeroc.com> | 2017-12-06 17:55:06 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2017-12-06 17:55:06 +0100 |
commit | ba65eee47c0297b4f2e8e6f266dffe91e3b55dcc (patch) | |
tree | 2e7878636d038a4a7e33e09be00b5675b6afc07f /csharp/src/IceBox/ServiceManagerI.cs | |
parent | Add IceSSL dependency to IceBox (diff) | |
download | ice-ba65eee47c0297b4f2e8e6f266dffe91e3b55dcc.tar.bz2 ice-ba65eee47c0297b4f2e8e6f266dffe91e3b55dcc.tar.xz ice-ba65eee47c0297b4f2e8e6f266dffe91e3b55dcc.zip |
Fix IceBox ServiceManager to correctly fallback to LoadFrom
With .NET Core Assembly.Load doesn't fail with an IOException
this was preventing LoadFrom for being try after Load failures
Diffstat (limited to 'csharp/src/IceBox/ServiceManagerI.cs')
-rw-r--r-- | csharp/src/IceBox/ServiceManagerI.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/csharp/src/IceBox/ServiceManagerI.cs b/csharp/src/IceBox/ServiceManagerI.cs index e1bb8edc6b2..e716bfa8360 100644 --- a/csharp/src/IceBox/ServiceManagerI.cs +++ b/csharp/src/IceBox/ServiceManagerI.cs @@ -507,13 +507,13 @@ class ServiceManagerI : ServiceManagerDisp_ { serviceAssembly = System.Reflection.Assembly.Load(assemblyName); } - catch(System.IO.IOException ex) + catch(Exception) { try { serviceAssembly = System.Reflection.Assembly.LoadFrom(assemblyName); } - catch(System.IO.IOException) + catch(Exception) { throw ex; } |