summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectionI.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2014-09-30 08:47:25 -0230
committerDwayne Boone <dwayne@zeroc.com>2014-09-30 08:47:25 -0230
commita2386d72868fc07f0b9b2898496a14bfb3c2c0af (patch)
treef283ad0d30a9f12c2e77947305790f2db073fbe7 /cpp/src/Ice/ConnectionI.cpp
parentFixed (ICE-5696) - Trying to connect openssl 0.9.8 client to OS X secure tran... (diff)
downloadice-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 'cpp/src/Ice/ConnectionI.cpp')
-rw-r--r--cpp/src/Ice/ConnectionI.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index c397e8d1b91..3d267e765a2 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -1191,7 +1191,7 @@ Ice::ConnectionI::setCallback(const ConnectionCallbackPtr& callback)
}
}
- if(closed)
+ if(closed && callback)
{
try
{