diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-08-30 11:36:52 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-08-30 11:36:52 +0200 |
| commit | e571c09451b73a52cba24a8da127b4e710f91241 (patch) | |
| tree | 34832352a1cc9c0d60ff3fdf1eee062f0884bf77 /csharp/src | |
| parent | Link libraries on Linux with --no-undefined (diff) | |
| download | ice-e571c09451b73a52cba24a8da127b4e710f91241.tar.bz2 ice-e571c09451b73a52cba24a8da127b4e710f91241.tar.xz ice-e571c09451b73a52cba24a8da127b4e710f91241.zip | |
Ported interceptor and ICE-6980 changes to java-compat
Diffstat (limited to 'csharp/src')
| -rw-r--r-- | csharp/src/Ice/Incoming.cs | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/csharp/src/Ice/Incoming.cs b/csharp/src/Ice/Incoming.cs index e7de261f118..5d7c51da7a5 100644 --- a/csharp/src/Ice/Incoming.cs +++ b/csharp/src/Ice/Incoming.cs @@ -85,11 +85,7 @@ namespace IceInternal //_observer = null; Debug.Assert(_observer == null); - if(_os != null) - { - _os.reset(); - } - + _os = null; _is = null; //_responseHandler = null; @@ -542,6 +538,14 @@ namespace IceInternal { Debug.Assert(_responseHandler != null); + if(exc is Ice.SystemException) + { + if(_responseHandler.systemException(_current.requestId, (Ice.SystemException)exc, amd)) + { + return; + } + } + try { throw exc; @@ -742,14 +746,6 @@ namespace IceInternal } catch(Ice.Exception ex) { - if(ex is Ice.SystemException) - { - if(_responseHandler.systemException(_current.requestId, (Ice.SystemException)ex, amd)) - { - return; - } - } - if(_instance.initializationData().properties.getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0) { warning(ex); |