You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by an...@apache.org on 2015/06/14 22:26:12 UTC
svn commit: r1685461 - in /lucene/dev/trunk/lucene: CHANGES.txt
core/src/java/org/apache/lucene/util/PrintStreamInfoStream.java
test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java
Author: andyetitmoves
Date: Sun Jun 14 20:26:12 2015
New Revision: 1685461
URL: http://svn.apache.org/r1685461
Log:
Revert r1685431: LUCENE-6564: Add milliseconds to timestamp in IW output for tests
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/PrintStreamInfoStream.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1685461&r1=1685460&r2=1685461&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Sun Jun 14 20:26:12 2015
@@ -148,9 +148,6 @@ Build
* LUCENE-6518: Don't report false thread leaks from IBM J9
ClassCache Reaper in test framework. (Dawid Weiss)
-* LUCENE-6564: Add milliseconds to timestamp in InfoStream output for tests
- (Ramkumar Aiyengar)
-
======================= Lucene 5.2.1 =======================
Bug Fixes
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/PrintStreamInfoStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/PrintStreamInfoStream.java?rev=1685461&r1=1685460&r2=1685461&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/PrintStreamInfoStream.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/PrintStreamInfoStream.java Sun Jun 14 20:26:12 2015
@@ -36,7 +36,7 @@ public class PrintStreamInfoStream exten
private static final AtomicInteger MESSAGE_ID = new AtomicInteger();
protected final int messageID;
- protected static final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.ROOT);
+ private static final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.ROOT);
protected final PrintStream stream;
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java?rev=1685461&r1=1685460&r2=1685461&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java Sun Jun 14 20:26:12 2015
@@ -23,6 +23,7 @@ import java.util.Date;
import java.util.HashSet;
import java.util.Locale;
import java.util.Random;
+import java.util.Set;
import java.util.TimeZone;
import org.apache.lucene.codecs.Codec;
@@ -98,7 +99,7 @@ final class TestRuleSetupAndRestoreClass
} else {
name = Thread.currentThread().getName();
}
- stream.println(component + " " + messageID + " [" + dateFormat.format(new Date()) + "; " + name + "]: " + message);
+ stream.println(component + " " + messageID + " [" + new Date() + "; " + name + "]: " + message);
}
}