Added Ice.Logger.DateFormat property

1 files changed, 20 insertions, 8 deletions

diff --git a/java/src/Ice/LoggerI.java b/java/src/Ice/LoggerI.java
index 2aded8f18bc..414bc7cbe50 100644
--- a/java/src/Ice/LoggerI.java
+++ b/java/src/Ice/LoggerI.java
@@ -12,14 +12,17 @@ package Ice;
 public final class LoggerI extends LocalObjectImpl implements Logger
 {
     public 
-    LoggerI(String prefix)
+    LoggerI(String prefix, String dateFormat)
     {
 	if(prefix.length() > 0)
 	{
 	    _prefix = prefix + ": ";
 	}
 
-	_date = new java.text.SimpleDateFormat("MM/dd/yy HH:mm:ss:SSS");
+	if(!dateFormat.equals("0"))
+	{
+	    _date = new java.text.SimpleDateFormat(dateFormat);
+	}
     }
 
     public void
@@ -37,8 +40,11 @@ public final class LoggerI extends LocalObjectImpl implements Logger
 	synchronized(_globalMutex)
 	{
             StringBuffer s = new StringBuffer("[ ");
-	    s.append(_date.format(new java.util.Date()));
-	    s.append(' ');
+	    if(_date != null)
+	    {
+	        s.append(_date.format(new java.util.Date()));
+	        s.append(' ');
+	    }
 	    s.append(_prefix);
 	    s.append(category);
 	    s.append(": ");
@@ -60,8 +66,11 @@ public final class LoggerI extends LocalObjectImpl implements Logger
 	synchronized(_globalMutex)
 	{
 	    StringBuffer s = new StringBuffer();
-	    s.append(_date.format(new java.util.Date()));
-	    s.append(' ');
+	    if(_date != null)
+	    {
+	        s.append(_date.format(new java.util.Date()));
+	        s.append(' ');
+	    }
 	    s.append(_prefix);
 	    s.append("warning: ");
 	    s.append(message);
@@ -75,8 +84,11 @@ public final class LoggerI extends LocalObjectImpl implements Logger
 	synchronized(_globalMutex)
 	{
 	    StringBuffer s = new StringBuffer();
-	    s.append(_date.format(new java.util.Date()));
-	    s.append(' ');
+	    if(_date != null)
+	    {
+	        s.append(_date.format(new java.util.Date()));
+	        s.append(' ');
+	    }
 	    s.append(_prefix);
 	    s.append("error: ");
 	    s.append(message);