diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Direct.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/Incoming.cpp | 2 |
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; } |