From f94eb5f938d33dc2ce9b09b03b5dc6ccf7bd46c2 Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Wed, 15 Oct 2014 17:26:45 +0200 Subject: Fixed ICE-5666: setting the invocation timeout to -2 provides the previous connection timeouts --- cpp/src/Ice/Proxy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cpp/src/Ice/Proxy.cpp') 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; -- cgit v1.2.3