diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-09-30 08:47:25 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-09-30 08:47:25 -0230 |
| commit | a2386d72868fc07f0b9b2898496a14bfb3c2c0af (patch) | |
| tree | f283ad0d30a9f12c2e77947305790f2db073fbe7 /java/src/Ice/ConnectionI.java | |
| parent | Fixed (ICE-5696) - Trying to connect openssl 0.9.8 client to OS X secure tran... (diff) | |
| download | ice-a2386d72868fc07f0b9b2898496a14bfb3c2c0af.tar.bz2 ice-a2386d72868fc07f0b9b2898496a14bfb3c2c0af.tar.xz ice-a2386d72868fc07f0b9b2898496a14bfb3c2c0af.zip | |
ICE-5585 in ConnectionI::SetCallback make sure callback is not null before calling
Diffstat (limited to 'java/src/Ice/ConnectionI.java')
| -rw-r--r-- | java/src/Ice/ConnectionI.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/Ice/ConnectionI.java b/java/src/Ice/ConnectionI.java index 4f251b111f3..ce29b34db9a 100644 --- a/java/src/Ice/ConnectionI.java +++ b/java/src/Ice/ConnectionI.java @@ -735,7 +735,7 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne } } - if(closed) + if(closed && callback != null) { try { @@ -2573,7 +2573,7 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne case IceInternal.Protocol.replyMsg: { - + IceInternal.TraceUtil.traceRecv(info.stream, _logger, _traceLevels); info.requestId = info.stream.readInt(); IceInternal.OutgoingAsync outAsync = _asyncRequests.remove(info.requestId); |