summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2004-07-04 14:36:49 +0000
committerMarc Laukien <marc@zeroc.com>2004-07-04 14:36:49 +0000
commit06f695acd37df59e43652d36e88cff8825951308 (patch)
treea05e315d3a57ac6471da95d233c0180a251d8542 /cpp/src
parentWin32 fix (diff)
downloadice-06f695acd37df59e43652d36e88cff8825951308.tar.bz2
ice-06f695acd37df59e43652d36e88cff8825951308.tar.xz
ice-06f695acd37df59e43652d36e88cff8825951308.zip
check for servantManager
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/Direct.cpp2
-rw-r--r--cpp/src/Ice/Incoming.cpp2
2 files changed, 2 insertions, 2 deletions
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;
}