Author: carnold
Date: Fri Aug 15 16:09:53 2008
New Revision: 686415
URL: http://svn.apache.org/viewvc?rev=686415&view=rev
Log:
Bug 45636: 2 tests for DateLayout are failing because of ill initialized
DateFormat
Modified:
logging/log4j/trunk/src/changes/changes.xml
logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/AbsoluteTimeDateFormat.java
logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/ISO8601DateFormat.java
Modified: logging/log4j/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/src/changes/changes.xml?rev=686415&r1=686414&r2=686415&view=diff
==============================================================================
--- logging/log4j/trunk/src/changes/changes.xml (original)
+++ logging/log4j/trunk/src/changes/changes.xml Fri Aug 15 16:09:53 2008
@@ -58,6 +58,7 @@
<action action="fix" issue="44157">InterruptedIOException ignored by
log4j.</action>
<action action="fix" issue="40246">HierarchyDynamicMBean missing
unregister MBean</action>
<action action="fix" issue="45635">Support -Dm2_repo option on Maven
build for non-default Maven repository location.</action>
+ <action action="fix" issue="45636">2 tests for DateLayout are failing
because of ill initialized DateFormat.</action>
</release>
Modified:
logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/AbsoluteTimeDateFormat.java
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/AbsoluteTimeDateFormat.java?rev=686415&r1=686414&r2=686415&view=diff
==============================================================================
---
logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/AbsoluteTimeDateFormat.java
(original)
+++
logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/AbsoluteTimeDateFormat.java
Fri Aug 15 16:09:53 2008
@@ -85,7 +85,7 @@
long now = date.getTime();
int millis = (int)(now % 1000);
- if ((now - millis) != previousTime) {
+ if ((now - millis) != previousTime || previousTimeWithoutMillis[0] == 0) {
// We reach this point at most once per second
// across all threads instead of each time format()
// is called. This saves considerable CPU time.
Modified:
logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/ISO8601DateFormat.java
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/ISO8601DateFormat.java?rev=686415&r1=686414&r2=686415&view=diff
==============================================================================
---
logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/ISO8601DateFormat.java
(original)
+++
logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/ISO8601DateFormat.java
Fri Aug 15 16:09:53 2008
@@ -67,7 +67,7 @@
long now = date.getTime();
int millis = (int)(now % 1000);
- if ((now - millis) != lastTime) {
+ if ((now - millis) != lastTime || lastTimeString[0] == 0) {
// We reach this point at most once per second
// across all threads instead of each time format()
// is called. This saves considerable CPU time.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
