diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/LoggerI.java | 35 | ||||
| -rw-r--r-- | java/src/IceInternal/Instance.java | 3 |
2 files changed, 15 insertions, 23 deletions
diff --git a/java/src/Ice/LoggerI.java b/java/src/Ice/LoggerI.java index 414bc7cbe50..7ef6691be57 100644 --- a/java/src/Ice/LoggerI.java +++ b/java/src/Ice/LoggerI.java @@ -12,17 +12,15 @@ package Ice; public final class LoggerI extends LocalObjectImpl implements Logger { public - LoggerI(String prefix, String dateFormat) + LoggerI(String prefix) { if(prefix.length() > 0) { _prefix = prefix + ": "; } - if(!dateFormat.equals("0")) - { - _date = new java.text.SimpleDateFormat(dateFormat); - } + _date = java.text.DateFormat.getDateInstance(java.text.DateFormat.SHORT); + _time = new java.text.SimpleDateFormat(" HH:mm:ss:SSS"); } public void @@ -40,11 +38,9 @@ public final class LoggerI extends LocalObjectImpl implements Logger synchronized(_globalMutex) { StringBuffer s = new StringBuffer("[ "); - if(_date != null) - { - s.append(_date.format(new java.util.Date())); - s.append(' '); - } + s.append(_date.format(new java.util.Date())); + s.append(_time.format(new java.util.Date())); + s.append(' '); s.append(_prefix); s.append(category); s.append(": "); @@ -66,11 +62,9 @@ public final class LoggerI extends LocalObjectImpl implements Logger synchronized(_globalMutex) { StringBuffer s = new StringBuffer(); - if(_date != null) - { - s.append(_date.format(new java.util.Date())); - s.append(' '); - } + s.append(_date.format(new java.util.Date())); + s.append(_time.format(new java.util.Date())); + s.append(' '); s.append(_prefix); s.append("warning: "); s.append(message); @@ -84,11 +78,9 @@ public final class LoggerI extends LocalObjectImpl implements Logger synchronized(_globalMutex) { StringBuffer s = new StringBuffer(); - if(_date != null) - { - s.append(_date.format(new java.util.Date())); - s.append(' '); - } + s.append(_date.format(new java.util.Date())); + s.append(_time.format(new java.util.Date())); + s.append(' '); s.append(_prefix); s.append("error: "); s.append(message); @@ -98,5 +90,6 @@ public final class LoggerI extends LocalObjectImpl implements Logger String _prefix = ""; static java.lang.Object _globalMutex = new java.lang.Object(); - java.text.SimpleDateFormat _date = null; + java.text.DateFormat _date = null; + java.text.SimpleDateFormat _time = null; } diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java index 20d199eb0f4..a2a82c6d21b 100644 --- a/java/src/IceInternal/Instance.java +++ b/java/src/IceInternal/Instance.java @@ -368,8 +368,7 @@ public final class Instance } else { - _initData.logger = new Ice.LoggerI(_initData.properties.getProperty("Ice.ProgramName"), - _initData.properties.getPropertyWithDefault("Ice.Logger.DateFormat", "yy/MM/dd HH:mm:ss:SSS")); + _initData.logger = new Ice.LoggerI(_initData.properties.getProperty("Ice.ProgramName")); } } |