diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-04-25 17:17:33 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-04-25 17:17:33 +0000 |
| commit | b0da046057e4c4d0ffd4d8244693073c5d59b8ef (patch) | |
| tree | b92660c64d315c5886309cbca4af2eb8fce0cde8 /cpp/src/Ice/ConnectionI.cpp | |
| parent | Added getSessionTimeout to Router (diff) | |
| download | ice-b0da046057e4c4d0ffd4d8244693073c5d59b8ef.tar.bz2 ice-b0da046057e4c4d0ffd4d8244693073c5d59b8ef.tar.xz ice-b0da046057e4c4d0ffd4d8244693073c5d59b8ef.zip | |
Fix race condition related to bug 535
Diffstat (limited to 'cpp/src/Ice/ConnectionI.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index bb9c687d561..b23e628466d 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -1199,6 +1199,10 @@ Ice::ConnectionI::setAdapter(const ObjectAdapterPtr& adapter) if(_adapter) { _servantManager = dynamic_cast<ObjectAdapterI*>(_adapter.get())->getServantManager(); + if(!_servantManager) + { + _adapter = 0; + } } else { |