diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-06-28 17:44:15 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-06-28 17:44:15 +0200 |
| commit | 97dcbc0c36cef9ef6b0dceb300dd3777d7f625a2 (patch) | |
| tree | 68c959ebb69a63edd78bdc655daefcb8deba87a7 /java/src | |
| parent | Fix to help investigating ICE-7198 (diff) | |
| download | ice-97dcbc0c36cef9ef6b0dceb300dd3777d7f625a2.tar.bz2 ice-97dcbc0c36cef9ef6b0dceb300dd3777d7f625a2.tar.xz ice-97dcbc0c36cef9ef6b0dceb300dd3777d7f625a2.zip | |
Fixed NPE in Java/IceSSL implementation
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/src/main/java/Ice/ConnectionI.java | 14 | ||||
| -rw-r--r-- | java/src/Ice/src/main/java/IceSSL/TransceiverI.java | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/java/src/Ice/src/main/java/Ice/ConnectionI.java b/java/src/Ice/src/main/java/Ice/ConnectionI.java index 76e42a41b99..7ecd288030a 100644 --- a/java/src/Ice/src/main/java/Ice/ConnectionI.java +++ b/java/src/Ice/src/main/java/Ice/ConnectionI.java @@ -1315,7 +1315,19 @@ public final class ConnectionI extends IceInternal.EventHandler if(close) { - _transceiver.close(); + try + { + _transceiver.close(); + } + catch(Ice.LocalException ex) + { + java.io.StringWriter sw = new java.io.StringWriter(); + java.io.PrintWriter pw = new java.io.PrintWriter(sw); + ex.printStackTrace(pw); + pw.flush(); + String s = "unexpected connection exception:\n " + _desc + "\n" + sw.toString(); + _instance.initializationData().logger.error(s); + } } if(_startCallback != null) diff --git a/java/src/Ice/src/main/java/IceSSL/TransceiverI.java b/java/src/Ice/src/main/java/IceSSL/TransceiverI.java index 20caf5de188..d34a83acdae 100644 --- a/java/src/Ice/src/main/java/IceSSL/TransceiverI.java +++ b/java/src/Ice/src/main/java/IceSSL/TransceiverI.java @@ -86,7 +86,7 @@ final class TransceiverI implements IceInternal.Transceiver @Override public void close() { - if(_isConnected) + if(_engine != null) { try { |