summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Reference.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2005-01-20 09:54:58 +0000
committerBenoit Foucher <benoit@zeroc.com>2005-01-20 09:54:58 +0000
commitdb6052fed7c910983a4b5d046ca6e5571071a5a0 (patch)
tree9cab5ecea61a50534b86f1b5ac0d2759fc692678 /cpp/src/Ice/Reference.cpp
parentno need to shutdown socket after sending close connection (diff)
downloadice-db6052fed7c910983a4b5d046ca6e5571071a5a0.tar.bz2
ice-db6052fed7c910983a4b5d046ca6e5571071a5a0.tar.xz
ice-db6052fed7c910983a4b5d046ca6e5571071a5a0.zip
:changeLocator()
:activate() which could cause it to raise ObjectAdapterDeactivatedException if the adapter was deactivated concurrently.
Diffstat (limited to 'cpp/src/Ice/Reference.cpp')
-rw-r--r--cpp/src/Ice/Reference.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index 3c77087b837..392aed1d0e6 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -922,10 +922,7 @@ IceInternal::IndirectReference::getEndpoints() const
ReferencePtr
IceInternal::IndirectReference::changeLocator(const LocatorPrx& newLocator) const
{
- assert(newLocator);
-
LocatorInfoPtr newLocatorInfo = getInstance()->locatorManager()->get(newLocator);
-
if(newLocatorInfo == _locatorInfo)
{
return IndirectReferencePtr(const_cast<IndirectReference*>(this));