You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2015/06/04 05:16:32 UTC

svn commit: r1683452 - in /lucene/dev/branches/branch_5x: ./ lucene/ lucene/CHANGES.txt lucene/test-framework/ lucene/test-framework/src/java/org/apache/lucene/util/QuickPatchThreadsFilter.java

Author: rmuir
Date: Thu Jun  4 03:16:31 2015
New Revision: 1683452

URL: http://svn.apache.org/r1683452
Log:
LUCENE-6518: classcache reaper needs exemption from thread leaks (J9)

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/lucene/   (props changed)
    lucene/dev/branches/branch_5x/lucene/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_5x/lucene/test-framework/   (props changed)
    lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/QuickPatchThreadsFilter.java

Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1683452&r1=1683451&r2=1683452&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Thu Jun  4 03:16:31 2015
@@ -42,6 +42,11 @@ Changes in Runtime Behavior
   structure of composite and leaf readers.  (Adrien Grand,
   Uwe Schindler)
 
+Build
+
+* LUCENE-6518: Don't report false thread leaks from IBM J9
+  ClassCache Reaper in test framework. (Dawid Weiss)
+
 ======================= Lucene 5.2.0 =======================
 
 New Features

Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/QuickPatchThreadsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/QuickPatchThreadsFilter.java?rev=1683452&r1=1683451&r2=1683452&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/QuickPatchThreadsFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/QuickPatchThreadsFilter.java Thu Jun  4 03:16:31 2015
@@ -26,15 +26,21 @@ public class QuickPatchThreadsFilter imp
   static final boolean isJ9;
   
   static {
-    isJ9 = System.getProperty("java.vm.info", "<?>").contains("IBM J9");
+    isJ9 = Constants.JAVA_VENDOR.startsWith("IBM");
   }
 
   @Override
   public boolean reject(Thread t) {
     if (isJ9) {
+      // LUCENE-6518
+      if ("ClassCache Reaper".equals(t.getName())) {
+        return true;
+      }
+
+      // LUCENE-4736
       StackTraceElement [] stack = t.getStackTrace();
       if (stack.length > 0 && stack[stack.length - 1].getClassName().equals("java.util.Timer$TimerImpl")) {
-        return true; // LUCENE-4736
+        return true;
       }
     }
     return false;