summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ObjectFactoryManager.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2002-01-14 18:43:01 +0000
committerMarc Laukien <marc@zeroc.com>2002-01-14 18:43:01 +0000
commitf453785066eff4e8d9f5c7fd63bd01b4260020ed (patch)
tree1410e9fc19a52042879f9f06fe9e6c1ecb443e2a /cpp/src/Ice/ObjectFactoryManager.cpp
parentfile ServerBlobject.cpp was initially added on branch glacier. (diff)
downloadice-f453785066eff4e8d9f5c7fd63bd01b4260020ed.tar.bz2
ice-f453785066eff4e8d9f5c7fd63bd01b4260020ed.tar.xz
ice-f453785066eff4e8d9f5c7fd63bd01b4260020ed.zip
glacier intergration
Diffstat (limited to 'cpp/src/Ice/ObjectFactoryManager.cpp')
-rw-r--r--cpp/src/Ice/ObjectFactoryManager.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/cpp/src/Ice/ObjectFactoryManager.cpp b/cpp/src/Ice/ObjectFactoryManager.cpp
index bccc543a15c..49bb6537e1b 100644
--- a/cpp/src/Ice/ObjectFactoryManager.cpp
+++ b/cpp/src/Ice/ObjectFactoryManager.cpp
@@ -49,8 +49,16 @@ IceInternal::ObjectFactoryManager::remove(const string& id)
if (p != _factoryMap.end())
{
p->second->destroy();
- _factoryMap.erase(p);
- _factoryMapHint = _factoryMap.end();
+
+ if (p == _factoryMapHint)
+ {
+ _factoryMap.erase(p++);
+ _factoryMapHint = p;
+ }
+ else
+ {
+ _factoryMap.erase(p);
+ }
}
}