diff options
| author | Marc Laukien <marc@zeroc.com> | 2002-01-14 18:43:01 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2002-01-14 18:43:01 +0000 |
| commit | f453785066eff4e8d9f5c7fd63bd01b4260020ed (patch) | |
| tree | 1410e9fc19a52042879f9f06fe9e6c1ecb443e2a /cpp/src/Ice/Object.cpp | |
| parent | file ServerBlobject.cpp was initially added on branch glacier. (diff) | |
| download | ice-f453785066eff4e8d9f5c7fd63bd01b4260020ed.tar.bz2 ice-f453785066eff4e8d9f5c7fd63bd01b4260020ed.tar.xz ice-f453785066eff4e8d9f5c7fd63bd01b4260020ed.zip | |
glacier intergration
Diffstat (limited to 'cpp/src/Ice/Object.cpp')
| -rw-r--r-- | cpp/src/Ice/Object.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index 4f8b7975f2c..81d065d7348 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -196,8 +196,15 @@ Ice::Object::ice_removeFacet(const string& name) if (p != _activeFacetMap.end()) { - _activeFacetMap.erase(p); - _activeFacetMapHint = _activeFacetMap.end(); + if (p == _activeFacetMapHint) + { + _activeFacetMap.erase(p++); + _activeFacetMapHint = p; + } + else + { + _activeFacetMap.erase(p); + } } } @@ -249,6 +256,6 @@ Ice::Blobject::__dispatch(Incoming& in, const Current& current) Int sz = in.is()->getReadEncapsSize(); in.is()->readBlob(inParams, sz); ice_invoke(inParams, outParams, current); - in.is()->writeBlob(outParams); + in.os()->writeBlob(outParams); return ::IceInternal::DispatchOK; } |