summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/ProtocolInstance.java
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2014-08-08 13:33:18 -0230
committerDwayne Boone <dwayne@zeroc.com>2014-08-08 13:33:18 -0230
commitc540f34ba2dd245e88cee99f39552efbd44c91e1 (patch)
treea637ce6dce7ad189069e784f21d5166c6a98aff1 /java/src/IceInternal/ProtocolInstance.java
parentFixed (ICE-5583) - Consider adding IceSSL.CertAuthFile to C# implementation (diff)
downloadice-c540f34ba2dd245e88cee99f39552efbd44c91e1.tar.bz2
ice-c540f34ba2dd245e88cee99f39552efbd44c91e1.tar.xz
ice-c540f34ba2dd245e88cee99f39552efbd44c91e1.zip
ICE-5596 add Ice.Default.Timeout property
Diffstat (limited to 'java/src/IceInternal/ProtocolInstance.java')
-rw-r--r--java/src/IceInternal/ProtocolInstance.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/java/src/IceInternal/ProtocolInstance.java b/java/src/IceInternal/ProtocolInstance.java
index f78060cc172..9e217d9df4a 100644
--- a/java/src/IceInternal/ProtocolInstance.java
+++ b/java/src/IceInternal/ProtocolInstance.java
@@ -77,6 +77,11 @@ public class ProtocolInstance
return _instance.defaultsAndOverrides().defaultEncoding;
}
+ public int defaultTimeout()
+ {
+ return _instance.defaultsAndOverrides().defaultTimeout;
+ }
+
public NetworkProxy networkProxy()
{
return _instance.networkProxy();