diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-10-15 17:26:45 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-10-15 17:26:45 +0200 |
| commit | f94eb5f938d33dc2ce9b09b03b5dc6ccf7bd46c2 (patch) | |
| tree | 6b12ef2c59421702743048393f4757c0d1e0c504 /cpp/src/Ice/Proxy.cpp | |
| parent | ICE-5732 missing tracing in throughput demo (diff) | |
| download | ice-f94eb5f938d33dc2ce9b09b03b5dc6ccf7bd46c2.tar.bz2 ice-f94eb5f938d33dc2ce9b09b03b5dc6ccf7bd46c2.tar.xz ice-f94eb5f938d33dc2ce9b09b03b5dc6ccf7bd46c2.zip | |
Fixed ICE-5666: setting the invocation timeout to -2 provides the previous connection timeouts
Diffstat (limited to 'cpp/src/Ice/Proxy.cpp')
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 13bd0120a8f..d18a38a96e5 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -1163,7 +1163,7 @@ IceProxy::Ice::Object::ice_getInvocationTimeout() const ObjectPrx IceProxy::Ice::Object::ice_invocationTimeout(Int newTimeout) const { - if(newTimeout < 1 && newTimeout != -1) + if(newTimeout < 1 && newTimeout != -1 && newTimeout != -2) { ostringstream s; s << "invalid value passed to ice_invocationTimeout: " << newTimeout; |