diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-10-27 20:19:56 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-10-27 20:19:56 +0000 |
| commit | 68df96bd989aac63df6ae1131aae34915d6a0781 (patch) | |
| tree | 66c0369209809b88675ebaa1dae9f06d6862f3bc /java/src | |
| parent | Implicit Context implementation + test (diff) | |
| download | ice-68df96bd989aac63df6ae1131aae34915d6a0781.tar.bz2 ice-68df96bd989aac63df6ae1131aae34915d6a0781.tar.xz ice-68df96bd989aac63df6ae1131aae34915d6a0781.zip | |
Removed defaultContext from InitializationData
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/InitializationData.java | 1 | ||||
| -rw-r--r-- | java/src/IceInternal/Instance.java | 13 |
2 files changed, 3 insertions, 11 deletions
diff --git a/java/src/Ice/InitializationData.java b/java/src/Ice/InitializationData.java index 62603c9086b..cfe4b33b684 100644 --- a/java/src/Ice/InitializationData.java +++ b/java/src/Ice/InitializationData.java @@ -36,6 +36,5 @@ public final class InitializationData implements Cloneable public Properties properties; public Logger logger; public Stats stats; - public java.util.Map defaultContext; public ThreadNotification threadHook; } diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java index aa5be0140bf..ed36c64e2a7 100644 --- a/java/src/IceInternal/Instance.java +++ b/java/src/IceInternal/Instance.java @@ -432,16 +432,9 @@ public final class Instance _endpointFactoryManager.add(udpEndpointFactory); _pluginManager = new Ice.PluginManagerI(communicator); - - if(_initData.defaultContext == null) - { - _defaultContext = _emptyContext; - } - else - { - _defaultContext = _initData.defaultContext; - } - + + _defaultContext = _emptyContext; + _outgoingConnectionFactory = new OutgoingConnectionFactory(this); _servantFactoryManager = new ObjectFactoryManager(); |