diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2005-10-17 01:51:14 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2005-10-17 01:51:14 +0000 |
| commit | 2a9ee625c5ec8d1a41f09cd0da08a4444e72bc40 (patch) | |
| tree | e986dcc0911218def7a5d472e4b32ab2ec852596 /java/src | |
| parent | New menu items for grand parents, and table/parameter/list dialogs are not (diff) | |
| download | ice-2a9ee625c5ec8d1a41f09cd0da08a4444e72bc40.tar.bz2 ice-2a9ee625c5ec8d1a41f09cd0da08a4444e72bc40.tar.xz ice-2a9ee625c5ec8d1a41f09cd0da08a4444e72bc40.zip | |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=515
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/IceInternal/Instance.java | 23 | ||||
| -rw-r--r-- | java/src/IceInternal/PropertyNames.java | 3 |
2 files changed, 6 insertions, 20 deletions
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java index a40eb31a534..b153ef5258a 100644 --- a/java/src/IceInternal/Instance.java +++ b/java/src/IceInternal/Instance.java @@ -418,24 +418,11 @@ public final class Instance } } - { - int clientACMDefault = 60; // Client ACM enabled by default. - int serverACMDefault = 0; // Server ACM disabled by default. - - // - // Legacy: If Ice.ConnectionIdleTime is set, we use it as - // default value for both the client- and server-side ACM. - // - if(_properties.getProperty("Ice.ConnectionIdleTime").length() > 0) - { - int num = _properties.getPropertyAsInt("Ice.ConnectionIdleTime"); - clientACMDefault = num; - serverACMDefault = num; - } - - _clientACM = _properties.getPropertyAsIntWithDefault("Ice.ACM.Client", clientACMDefault); - _serverACM = _properties.getPropertyAsIntWithDefault("Ice.ACM.Server",serverACMDefault); - } + // + // Client ACM enabled by default. Server ACM disabled by default. + // + _clientACM = _properties.getPropertyAsIntWithDefault("Ice.ACM.Client", 60); + _serverACM = _properties.getPropertyAsInt("Ice.ACM.Server"); _threadPerConnection = _properties.getPropertyAsInt("Ice.ThreadPerConnection") > 0; diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java index e4f39c43c10..88714cab7f7 100644 --- a/java/src/IceInternal/PropertyNames.java +++ b/java/src/IceInternal/PropertyNames.java @@ -7,7 +7,7 @@ // // ********************************************************************** -// Generated by makeprops.py from file `../config/PropertyNames.def', Fri Oct 14 09:51:50 2005 +// Generated by makeprops.py from file `/Users/matthew/zeroc/ice/config/PropertyNames.def', Mon Oct 17 10:34:01 2005 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -22,7 +22,6 @@ public final class PropertyNames "^Ice\\.ChangeUser$", "^Ice\\.Compression\\.Level$", "^Ice\\.Config$", - "^Ice\\.ConnectionIdleTime$", "^Ice\\.Default\\.CollocationOptimization$", "^Ice\\.Default\\.Host$", "^Ice\\.Default\\.Locator$", |