diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-11-13 10:17:27 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-11-13 10:17:27 +0100 |
| commit | 99b44d083eeee5583adfe642081a827224fa1309 (patch) | |
| tree | 46bb3af634cbd5d90b9e5d46099f4e0e85f70ec6 /cpp/src/Ice/RouterInfo.h | |
| parent | Cosmetic updates to IceGrid Admin connection wizard (diff) | |
| download | ice-99b44d083eeee5583adfe642081a827224fa1309.tar.bz2 ice-99b44d083eeee5583adfe642081a827224fa1309.tar.xz ice-99b44d083eeee5583adfe642081a827224fa1309.zip | |
Fixed ICE-4927: fixed proxy encoding to marshal protocol/encoding version instead of encoding it in endpoints
Diffstat (limited to 'cpp/src/Ice/RouterInfo.h')
| -rw-r--r-- | cpp/src/Ice/RouterInfo.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h index c1b1077a73b..7caaafc97cf 100644 --- a/cpp/src/Ice/RouterInfo.h +++ b/cpp/src/Ice/RouterInfo.h @@ -76,7 +76,13 @@ public: bool operator!=(const RouterInfo&) const; bool operator<(const RouterInfo&) const; - Ice::RouterPrx getRouter() const; + const Ice::RouterPrx& getRouter() const + { + // + // No mutex lock necessary, _router is immutable. + // + return _router; + } void getClientProxyResponse(const Ice::ObjectPrx&, const GetClientEndpointsCallbackPtr&); void getClientProxyException(const Ice::Exception&, const GetClientEndpointsCallbackPtr&); std::vector<EndpointIPtr> getClientEndpoints(); |