diff options
| author | Jose <jose@zeroc.com> | 2018-02-08 17:23:26 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2018-02-08 17:23:26 +0100 |
| commit | 41a4ea50bba42cd4585244f5a8e3ccbc6c20da4c (patch) | |
| tree | 92eda1d6156d91d4bfce18f8fc06820af1e401ff /cpp/src/Glacier2/SessionRouterI.cpp | |
| parent | Remove old files (diff) | |
| parent | Fixed matlab check for testing (diff) | |
| download | ice-41a4ea50bba42cd4585244f5a8e3ccbc6c20da4c.tar.bz2 ice-41a4ea50bba42cd4585244f5a8e3ccbc6c20da4c.tar.xz ice-41a4ea50bba42cd4585244f5a8e3ccbc6c20da4c.zip | |
Merge branch '3.7' of github.com:zeroc-ice/ice into 3.7
Diffstat (limited to 'cpp/src/Glacier2/SessionRouterI.cpp')
| -rw-r--r-- | cpp/src/Glacier2/SessionRouterI.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cpp/src/Glacier2/SessionRouterI.cpp b/cpp/src/Glacier2/SessionRouterI.cpp index e485f76c921..d97f55bcde0 100644 --- a/cpp/src/Glacier2/SessionRouterI.cpp +++ b/cpp/src/Glacier2/SessionRouterI.cpp @@ -1125,7 +1125,12 @@ SessionRouterI::expireSessions() RouterIPtr SessionRouterI::getRouterImpl(const ConnectionPtr& connection, const Ice::Identity& id, bool close) const { - if(_destroy) + // + // The connection can be null if the client tries to forward requests to + // a proxy which points to the client endpoints (in which case the request + // is forwarded with collocation optimization). + // + if(_destroy || !connection) { throw ObjectNotExistException(__FILE__, __LINE__); } |