summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectionI.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2005-09-02 16:02:40 +0000
committerDwayne Boone <dwayne@zeroc.com>2005-09-02 16:02:40 +0000
commit5ce3e97763994d912eecc242bc04b3328e2473ce (patch)
tree70739d6bed090f64f15e090a8faadbefc715222d /cpp/src/Ice/ConnectionI.cpp
parentUse auto_ptr reset (diff)
downloadice-5ce3e97763994d912eecc242bc04b3328e2473ce.tar.bz2
ice-5ce3e97763994d912eecc242bc04b3328e2473ce.tar.xz
ice-5ce3e97763994d912eecc242bc04b3328e2473ce.zip
Fixed potential NPE
Diffstat (limited to 'cpp/src/Ice/ConnectionI.cpp')
-rw-r--r--cpp/src/Ice/ConnectionI.cpp19
1 files changed, 11 insertions, 8 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index 72827746f9b..25bfd249351 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -2294,16 +2294,19 @@ Ice::ConnectionI::run()
//
IceUtil::Mutex::Lock sendSync(_sendMutex);
- try
+ if(_transceiver)
{
- _transceiver->close();
- }
- catch(const LocalException&)
- {
- // Here we ignore any exceptions in close().
- }
+ try
+ {
+ _transceiver->close();
+ }
+ catch(const LocalException&)
+ {
+ // Here we ignore any exceptions in close().
+ }
- _transceiver = 0;
+ _transceiver = 0;
+ }
notifyAll();
return;
}