2589 - Bogus Ice.ProgramName value for IceBox service.

3 files changed, 21 insertions, 2 deletions

diff --git a/java/src/Ice/LoggerI.java b/java/src/Ice/LoggerI.java
index 61aa550c907..2468618cbc7 100644
--- a/java/src/Ice/LoggerI.java
+++ b/java/src/Ice/LoggerI.java
@@ -25,13 +25,14 @@ public class LoggerI implements Logger
 
         if(file.length() != 0)
         {
+            _file = file;
             try
             {
-                _out = new java.io.FileOutputStream(new java.io.File(file), true);
+                _out = new java.io.FileOutputStream(new java.io.File(_file), true);
             }
             catch(java.io.FileNotFoundException ex)
             {
-                throw new InitializationException("FileLogger: cannot open " + file);
+                throw new InitializationException("FileLogger: cannot open " + _file);
             }
         }
     }
@@ -106,6 +107,12 @@ public class LoggerI implements Logger
         write(s, true);
     }
 
+    public Logger
+    cloneWithPrefix(String prefix)
+    {
+        return new LoggerI(prefix, _file);
+    }
+
     private void
     write(StringBuilder message, boolean indent)
     {
@@ -137,6 +144,7 @@ public class LoggerI implements Logger
     }
 
     String _prefix = "";
+    String _file = "";
     String _lineSeparator;
     java.text.DateFormat _date;
     java.text.SimpleDateFormat _time;
diff --git a/java/src/Ice/SysLoggerI.java b/java/src/Ice/SysLoggerI.java
index c1d03f6b35e..e782aa18f7f 100644
--- a/java/src/Ice/SysLoggerI.java
+++ b/java/src/Ice/SysLoggerI.java
@@ -63,6 +63,12 @@ public final class SysLoggerI implements Logger
         log(LOG_ERR, message);
     }
 
+    public Logger
+    cloneWithPrefix(String prefix)
+    {
+        return new SysLoggerI(prefix);
+    }
+
     private void
     log(int severity, String message)
     {
diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java
index e5571b291e7..0c5620031ee 100644
--- a/java/src/IceBox/ServiceManagerI.java
+++ b/java/src/IceBox/ServiceManagerI.java
@@ -558,6 +558,11 @@ public class ServiceManagerI extends _ServiceManagerDisp
                 }
             
                 //
+                // Clone the logger to assing a new prefix.
+                //
+                initData.logger = _logger.cloneWithPrefix(initData.properties.getProperty("Ice.ProgramName"));
+
+                //
                 // Remaining command line options are passed to the communicator. This is 
                 // necessary for Ice plug-in properties (e.g.: IceSSL).
                 //