diff options
| author | Marc Laukien <marc@zeroc.com> | 2004-10-21 18:58:04 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2004-10-21 18:58:04 +0000 |
| commit | 80d153dcde86a890fc63c147ac47dabb6af91570 (patch) | |
| tree | e5eb53835dda09f97c8b04eb294792bb56b6f4e4 /cpp/src/Ice/Proxy.cpp | |
| parent | demo build.xml now use Ice.jar (and db.jar if present), which is more (diff) | |
| download | ice-80d153dcde86a890fc63c147ac47dabb6af91570.tar.bz2 ice-80d153dcde86a890fc63c147ac47dabb6af91570.tar.xz ice-80d153dcde86a890fc63c147ac47dabb6af91570.zip | |
timeout for clientProxy / ice_connection
Diffstat (limited to 'cpp/src/Ice/Proxy.cpp')
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index d516ccecf54..99fdf23b5d4 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -21,7 +21,7 @@ #include <Ice/LocatorInfo.h> #include <Ice/BasicStream.h> #include <Ice/LocalException.h> -#include <Ice/ConnectionI.h> // To convert from ConnectionIPtr to ConnectionPtr in ice_getConnection(). +#include <Ice/ConnectionI.h> // To convert from ConnectionIPtr to ConnectionPtr in ice_connection(). #include <Ice/Stream.h> using namespace std; @@ -565,7 +565,7 @@ IceProxy::Ice::Object::ice_default() const } ConnectionPtr -IceProxy::Ice::Object::ice_getConnection() +IceProxy::Ice::Object::ice_connection() { int __cnt = 0; while(true) @@ -573,7 +573,7 @@ IceProxy::Ice::Object::ice_getConnection() try { Handle< ::IceDelegate::Ice::Object> __del = __getDelegate(); - return __del->ice_getConnection(); + return __del->ice_connection(); } catch(const LocalException& __ex) { @@ -879,7 +879,7 @@ IceDelegateM::Ice::Object::ice_invoke(const string& operation, } ConnectionPtr -IceDelegateM::Ice::Object::ice_getConnection() +IceDelegateM::Ice::Object::ice_connection() { return __connection; } @@ -983,7 +983,7 @@ IceDelegateD::Ice::Object::ice_invoke(const string&, } ConnectionPtr -IceDelegateD::Ice::Object::ice_getConnection() +IceDelegateD::Ice::Object::ice_connection() { throw CollocationOptimizationException(__FILE__, __LINE__); } |