diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-08-19 12:29:19 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-08-19 12:29:19 +0200 |
| commit | 01eff251dc17285e265323bf97e0566095de1096 (patch) | |
| tree | 414a9ababbae22dfc40dc02bcb688ad89e67beb0 /cpp/src | |
| parent | Merge branch 'master' of cvs.zeroc.com:/home/git/ice (diff) | |
| download | ice-01eff251dc17285e265323bf97e0566095de1096.tar.bz2 ice-01eff251dc17285e265323bf97e0566095de1096.tar.xz ice-01eff251dc17285e265323bf97e0566095de1096.zip | |
Fixed bug 4221 - Glacier2 router getCategoryForClient raises NullHandleException
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Glacier2/SessionRouterI.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cpp/src/Glacier2/SessionRouterI.cpp b/cpp/src/Glacier2/SessionRouterI.cpp index f8a6c1c6034..985f1892bfe 100644 --- a/cpp/src/Glacier2/SessionRouterI.cpp +++ b/cpp/src/Glacier2/SessionRouterI.cpp @@ -776,7 +776,14 @@ string Glacier2::SessionRouterI::getCategoryForClient(const Ice::Current& current) const { // Forward to the per-client router. - return getRouter(current.con, current.id)->getServerProxy(current)->ice_getIdentity().category; + if(_instance->serverObjectAdapter()) + { + return getRouter(current.con, current.id)->getServerProxy(current)->ice_getIdentity().category; + } + else + { + return ""; + } } void |