DefaultsAndOverwrites

5 files changed, 87 insertions, 28 deletions

diff --git a/java/src/IceInternal/DefaultsAndOverwrites.java b/java/src/IceInternal/DefaultsAndOverwrites.java
new file mode 100644
index 00000000000..2bcfe5a50c6
--- /dev/null
+++ b/java/src/IceInternal/DefaultsAndOverwrites.java
@@ -0,0 +1,66 @@
+// **********************************************************************
+//
+// Copyright (c) 2001
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+package IceInternal;
+
+public final class DefaultsAndOverwrites
+{
+    DefaultsAndOverwrites(Ice.Properties properties)
+    {
+	String value;
+	
+	defaultProtocol = properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
+
+	value = properties.getProperty("Ice.Default.Host");
+	if (value.length() != 0)
+	{
+	    defaultHost = value;
+	}
+	else
+	{
+	    defaultHost = Network.getLocalHost(true);
+	}
+	
+	defaultRouter = properties.getProperty("Ice.Default.Router");
+	
+	value = properties.getProperty("Ice.Overwrite.Timeout");
+	if (value.length() > 0)
+	{
+	    overwriteTimeout = true;
+	    overwriteTimeoutValue = properties.getPropertyAsInt("Ice.Overwrite.Timeout");
+	}
+	else
+	{
+	    overwriteTimeout = false;
+	    overwriteTimeoutValue = -1;
+	}
+
+	value = properties.getProperty("Ice.Overwrite.Compress");
+	if (value.length() > 0)
+	{
+	    overwriteCompress = true;
+	    overwriteCompressValue = properties.getPropertyAsInt("Ice.Overwrite.Compress") != 0;
+	}
+	else
+	{
+	    overwriteCompress = false;
+	    overwriteCompressValue = false;
+	}
+    }
+
+    final public String defaultHost;
+    final public String defaultProtocol;
+    final public String defaultRouter;
+
+    final public boolean overwriteTimeout;
+    final public int overwriteTimeoutValue;
+    final public boolean overwriteCompress;
+    final public boolean overwriteCompressValue;
+}
diff --git a/java/src/IceInternal/EndpointFactoryManager.java b/java/src/IceInternal/EndpointFactoryManager.java
index a56a600d6de..6eaf1bfb8b4 100644
--- a/java/src/IceInternal/EndpointFactoryManager.java
+++ b/java/src/IceInternal/EndpointFactoryManager.java
@@ -63,7 +63,7 @@ public final class EndpointFactoryManager
 
         if (protocol.equals("default"))
         {
-            protocol = _instance.defaultProtocol();
+            protocol = _instance.defaultsAndOverwrites().defaultProtocol;
         }
 
         for (int i = 0; i < _factories.size(); i++)
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index 97d70b4db8a..7420af631d9 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -44,18 +44,11 @@ public class Instance
         return _traceLevels;
     }
 
-    public String
-    defaultProtocol()
+    public DefaultsAndOverwrites
+    defaultsAndOverwrites()
     {
 	// No mutex lock, immutable.
-        return _defaultProtocol;
-    }
-
-    public String
-    defaultHost()
-    {
-	// No mutex lock, immutable.
-        return _defaultHost;
+        return _defaultsAndOverwrites;
     }
 
     public synchronized RouterManager
@@ -164,20 +157,17 @@ public class Instance
         try
         {
             _logger = new Ice.LoggerI();
+
             _traceLevels = new TraceLevels(_properties);
-            _defaultProtocol = _properties.getPropertyWithDefault("Ice.DefaultProtocol", "tcp");
-            _defaultHost = _properties.getProperty("Ice.DefaultHost");
-	    if (_defaultHost.length() == 0)
-	    {
-		_defaultHost = Network.getLocalHost(true);
-	    }	    
+
+            _defaultsAndOverwrites = new DefaultsAndOverwrites(_properties);
+
             _routerManager = new RouterManager();
+
             _referenceFactory = new ReferenceFactory(this);
+
             _proxyFactory = new ProxyFactory(this);
 
-            //
-            // Install TCP and UDP endpoint factories.
-            //
             _endpointFactoryManager = new EndpointFactoryManager(this);
             EndpointFactory tcpEndpointFactory = new TcpEndpointFactory(this);
             _endpointFactoryManager.add(tcpEndpointFactory);
@@ -186,16 +176,20 @@ public class Instance
 
             _pluginManager = new Ice.PluginManagerI(this);
 
-            String router = _properties.getProperty("Ice.DefaultRouter");
-            if (router.length() > 0)
+            if (_defaultsAndOverwrites.defaultRouter.length() > 0)
             {
-                _referenceFactory.setDefaultRouter(
-		    Ice.RouterPrxHelper.uncheckedCast(_proxyFactory.stringToProxy(router)));
+                _referenceFactory.setDefaultRouter(Ice.RouterPrxHelper.uncheckedCast(
+		    _proxyFactory.stringToProxy(_defaultsAndOverwrites.defaultRouter)));
             }
+
             _outgoingConnectionFactory = new OutgoingConnectionFactory(this);
+
             _servantFactoryManager = new ObjectFactoryManager();
+
             _userExceptionFactoryManager = new UserExceptionFactoryManager();
+
             _objectAdapterFactory = new ObjectAdapterFactory(this);
+
             _bufferManager = new BufferManager(); // Must be created before the ThreadPool
         }
         catch (Ice.LocalException ex)
@@ -354,6 +348,7 @@ public class Instance
     private Ice.Properties _properties; // Immutable, not reset by destroy().
     private Ice.Logger _logger; // Not reset by destroy().
     private TraceLevels _traceLevels; // Immutable, not reset by destroy().
+    private DefaultsAndOverwrites _defaultsAndOverwrites; // Immutable, not reset by destroy().
     private RouterManager _routerManager;
     private ReferenceFactory _referenceFactory;
     private ProxyFactory _proxyFactory;
@@ -363,8 +358,6 @@ public class Instance
     private ObjectAdapterFactory _objectAdapterFactory;
     private ThreadPool _clientThreadPool;
     private ThreadPool _serverThreadPool;
-    private String _defaultProtocol; // Immutable, not reset by destroy().
-    private String _defaultHost; // Immutable, not reset by destroy().
     private EndpointFactoryManager _endpointFactoryManager;
     private Ice.PluginManager _pluginManager;
     private BufferManager _bufferManager; // Immutable, not reset by destroy().
diff --git a/java/src/IceInternal/TcpEndpoint.java b/java/src/IceInternal/TcpEndpoint.java
index ce848ee6627..6d1655c499b 100644
--- a/java/src/IceInternal/TcpEndpoint.java
+++ b/java/src/IceInternal/TcpEndpoint.java
@@ -115,7 +115,7 @@ final class TcpEndpoint implements Endpoint
 
         if (_host == null)
         {
-            _host = _instance.defaultHost();
+            _host = _instance.defaultsAndOverwrites().defaultHost;
         }
 
         calcHashValue();
diff --git a/java/src/IceInternal/UdpEndpoint.java b/java/src/IceInternal/UdpEndpoint.java
index c55beaf0e04..a391c265c23 100644
--- a/java/src/IceInternal/UdpEndpoint.java
+++ b/java/src/IceInternal/UdpEndpoint.java
@@ -107,7 +107,7 @@ final class UdpEndpoint implements Endpoint
 
         if (_host == null)
         {
-            _host = instance.defaultHost();
+            _host = instance.defaultsAndOverwrites().defaultHost;
         }
 
         calcHashValue();