diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-05-23 11:59:44 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-05-23 11:59:44 +0200 |
| commit | d81701ca8182942b7936f9fd84a019b695e9c890 (patch) | |
| tree | dc036c9d701fbbe1afad67782bd78572c0f61974 /java/src/IceInternal/ReferenceFactory.java | |
| parent | Fixed bug ICE-5543: stringToIdentity bug with escaped escapes (diff) | |
| download | ice-d81701ca8182942b7936f9fd84a019b695e9c890.tar.bz2 ice-d81701ca8182942b7936f9fd84a019b695e9c890.tar.xz ice-d81701ca8182942b7936f9fd84a019b695e9c890.zip | |
Added support for invocation timeouts and ACM heartbeats
Diffstat (limited to 'java/src/IceInternal/ReferenceFactory.java')
| -rw-r--r-- | java/src/IceInternal/ReferenceFactory.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/java/src/IceInternal/ReferenceFactory.java b/java/src/IceInternal/ReferenceFactory.java index 4c15505c11d..b5e7aca509e 100644 --- a/java/src/IceInternal/ReferenceFactory.java +++ b/java/src/IceInternal/ReferenceFactory.java @@ -671,8 +671,8 @@ public final class ReferenceFactory "EndpointSelection", "ConnectionCached", "PreferSecure", - "EncodingVersion", "LocatorCacheTimeout", + "InvocationTimeout", "Locator", "Router", "CollocationOptimized", @@ -759,6 +759,7 @@ public final class ReferenceFactory boolean preferSecure = defaultsAndOverrides.defaultPreferSecure; Ice.EndpointSelectionType endpointSelection = defaultsAndOverrides.defaultEndpointSelection; int locatorCacheTimeout = defaultsAndOverrides.defaultLocatorCacheTimeout; + int invocationTimeout = defaultsAndOverrides.defaultInvocationTimeout; java.util.Map<String, String> context = null; // @@ -839,6 +840,9 @@ public final class ReferenceFactory property = propertyPrefix + ".LocatorCacheTimeout"; locatorCacheTimeout = properties.getPropertyAsIntWithDefault(property, locatorCacheTimeout); + property = propertyPrefix + ".InvocationTimeout"; + invocationTimeout = properties.getPropertyAsIntWithDefault(property, invocationTimeout); + property = propertyPrefix + ".Context."; java.util.Map<String, String> contexts = properties.getPropertiesForPrefix(property); if(!contexts.isEmpty()) @@ -871,6 +875,7 @@ public final class ReferenceFactory preferSecure, endpointSelection, locatorCacheTimeout, + invocationTimeout, context); } |