diff options
| author | Marc Laukien <marc@zeroc.com> | 2004-07-04 14:36:49 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2004-07-04 14:36:49 +0000 |
| commit | 06f695acd37df59e43652d36e88cff8825951308 (patch) | |
| tree | a05e315d3a57ac6471da95d233c0180a251d8542 /cpp | |
| parent | Win32 fix (diff) | |
| download | ice-06f695acd37df59e43652d36e88cff8825951308.tar.bz2 ice-06f695acd37df59e43652d36e88cff8825951308.tar.xz ice-06f695acd37df59e43652d36e88cff8825951308.zip | |
check for servantManager
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/CHANGES | 6 | ||||
| -rw-r--r-- | cpp/src/Ice/Direct.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/Incoming.cpp | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/cpp/CHANGES b/cpp/CHANGES index d6c68fd4813..c76574fdcf1 100644 --- a/cpp/CHANGES +++ b/cpp/CHANGES @@ -1,6 +1,10 @@ Changes since version 1.4.0 --------------------------- +- Fixed a bug that could cause an assert or exception in some rare + circumstances, if an operation is invoked after the object adapter + for the Ice object has been deactivated. + - Fixed a bug in the C++ translator that caused compile errors when two Slice classes with the same name appeared in different modules in the same file. @@ -17,6 +21,8 @@ Changes since version 1.4.0 IcePatchCalc.exe -> icepatchcalc.exe TransformDB.exe -> transformdb.exe + All library names have also been renamed accordingly. + - Changed the default behavior of the IcePatch client to dynamically calculate the unique signatures of local files in order to reduce the number of cache files, and added the property IcePatch.Dynamic diff --git a/cpp/src/Ice/Direct.cpp b/cpp/src/Ice/Direct.cpp index 0ce778f27b0..885a6731467 100644 --- a/cpp/src/Ice/Direct.cpp +++ b/cpp/src/Ice/Direct.cpp @@ -61,7 +61,7 @@ IceInternal::Direct::Direct(const Current& current) : if(!_servant) { - if(servantManager->hasServant(_current.id)) + if(servantManager && servantManager->hasServant(_current.id)) { FacetNotExistException ex(__FILE__, __LINE__); ex.id = _current.id; diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp index bb460595a2d..9a685c16849 100644 --- a/cpp/src/Ice/Incoming.cpp +++ b/cpp/src/Ice/Incoming.cpp @@ -183,7 +183,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager) if(!_servant) { - if(servantManager->hasServant(_current.id)) + if(servantManager && servantManager->hasServant(_current.id)) { status = DispatchFacetNotExist; } |