http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=87

4 files changed, 46 insertions, 15 deletions

diff --git a/java/src/Ice/Application.java b/java/src/Ice/Application.java
index db3328804b4..ed55d84c2b9 100644
--- a/java/src/Ice/Application.java
+++ b/java/src/Ice/Application.java
@@ -60,7 +60,7 @@ public abstract class Application
             }
             else
             {
-                _communicator = Util.initialize(argHolder);
+                _communicator = Util.initializeWithLogger(argHolder, logger);
             }
 
             //
diff --git a/java/src/Ice/CommunicatorI.java b/java/src/Ice/CommunicatorI.java
index 292f28d82a5..1be4bc7ab93 100644
--- a/java/src/Ice/CommunicatorI.java
+++ b/java/src/Ice/CommunicatorI.java
@@ -149,9 +149,9 @@ public final class CommunicatorI extends LocalObjectImpl implements Communicator
         _instance.flushBatchRequests();
     }
 
-    CommunicatorI(Properties properties)
+    CommunicatorI(Properties properties, Logger logger)
     {
-        _instance = new IceInternal.Instance(this, properties);
+        _instance = new IceInternal.Instance(this, properties, logger);
     }
 
     /**
diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java
index 6e27ba8bde6..81e8c445c3f 100644
--- a/java/src/Ice/Util.java
+++ b/java/src/Ice/Util.java
@@ -67,7 +67,7 @@ public final class Util
     initialize(StringSeqHolder args)
     {
         Properties properties = getDefaultProperties(args);
-	return initializeWithProperties(args, properties);
+	return initializeWithPropertiesAndLogger(args, properties, null);
     }
 
     public static Communicator
@@ -78,20 +78,47 @@ public final class Util
     }
 
     public static Communicator
+    initializeWithLogger(StringSeqHolder args, Logger logger)
+    {
+        Properties properties = getDefaultProperties(args);
+	return initializeWithPropertiesAndLogger(args, properties, logger);
+    }
+
+    public static Communicator
+    initializeWithLogger(String[] args, Logger logger)
+    {
+        StringSeqHolder argsH = new StringSeqHolder(args);
+	return initializeWithLogger(argsH, logger);
+    }
+
+    public static Communicator
     initializeWithProperties(StringSeqHolder args, Properties properties)
     {
+    	return initializeWithPropertiesAndLogger(args, properties, null);
+    }
+
+    public static Communicator
+    initializeWithProperties(String[] args, Properties properties)
+    {
+        StringSeqHolder argsH = new StringSeqHolder(args);
+	return initializeWithProperties(argsH, properties);
+    }
+
+    public static Communicator
+    initializeWithPropertiesAndLogger(StringSeqHolder args, Properties properties, Logger logger)
+    {
 	args.value = properties.parseIceCommandLineOptions(args.value);
 
-        CommunicatorI result = new CommunicatorI(properties);
+        CommunicatorI result = new CommunicatorI(properties, logger);
         result.finishSetup(args);
         return result;
     }
 
     public static Communicator
-    initializeWithProperties(String[] args, Properties properties)
+    initializeWithPropertiesAndLogger(String[] args, Properties properties, Logger logger)
     {
         StringSeqHolder argsH = new StringSeqHolder(args);
-	return initializeWithProperties(argsH, properties);
+	return initializeWithPropertiesAndLogger(argsH, properties, logger);
     }
 
     public static IceInternal.Instance
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index ccbd703ceae..a40eb31a534 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -310,10 +310,11 @@ public final class Instance
     // Only for use by Ice.CommunicatorI
     //
     public
-    Instance(Ice.Communicator communicator, Ice.Properties properties)
+    Instance(Ice.Communicator communicator, Ice.Properties properties, Ice.Logger logger)
     {
         _state = StateActive;
         _properties = properties;
+    	_logger = logger;
 
         try
         {
@@ -379,14 +380,17 @@ public final class Instance
 		}
 	    }
 
-	    if(_properties.getPropertyAsInt("Ice.UseSyslog") > 0)
+    	    if(_logger == null)
 	    {
-		_logger = new Ice.SysLoggerI(_properties.getProperty("Ice.ProgramName"));
-	    }
-	    else
-	    {
-		_logger = new Ice.LoggerI(_properties.getProperty("Ice.ProgramName"),
-					  _properties.getPropertyAsInt("Ice.Logger.Timestamp") > 0);
+		if(_properties.getPropertyAsInt("Ice.UseSyslog") > 0)
+		{
+		    _logger = new Ice.SysLoggerI(_properties.getProperty("Ice.ProgramName"));
+		}
+		else
+		{
+		    _logger = new Ice.LoggerI(_properties.getProperty("Ice.ProgramName"),
+					      _properties.getPropertyAsInt("Ice.Logger.Timestamp") > 0);
+		}
 	    }
 
 	    _stats = null; // There is no default statistics callback object.