lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From si...@apache.org
Subject svn commit: r1291297 - in /lucene/dev/branches/branch_3x: ./ lucene/ lucene/contrib/spellchecker/ solr/ solr/CHANGES.txt solr/core/ solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java
Date Mon, 20 Feb 2012 14:57:36 GMT
Author: siren
Date: Mon Feb 20 14:57:36 2012
New Revision: 1291297

URL: http://svn.apache.org/viewvc?rev=1291297&view=rev
Log:
SOLR-3068: add check against nulls

Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/lucene/contrib/spellchecker/   (props changed)
    lucene/dev/branches/branch_3x/solr/   (props changed)
    lucene/dev/branches/branch_3x/solr/CHANGES.txt
    lucene/dev/branches/branch_3x/solr/core/   (props changed)
    lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java

Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1291297&r1=1291296&r2=1291297&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Mon Feb 20 14:57:36 2012
@@ -110,6 +110,8 @@ Optimizations
 
 Bug Fixes
 ----------------------
+* SOLR-3068: Fixed NPE in ThreadDumpHandler (siren)
+
 * SOLR-2912: Fixed File descriptor leak in ShowFileRequestHandler (Michael Ryan, shalin)
 
 * SOLR-2819: Improved speed of parsing hex entities in HTMLStripCharFilter

Modified: lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java?rev=1291297&r1=1291296&r2=1291297&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java
(original)
+++ lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java
Mon Feb 20 14:57:36 2012
@@ -62,7 +62,9 @@ public class ThreadDumpHandler extends R
       tinfos = tmbean.getThreadInfo(tids, Integer.MAX_VALUE);
       NamedList<SimpleOrderedMap<Object>> lst = new NamedList<SimpleOrderedMap<Object>>();
       for (ThreadInfo ti : tinfos) {
-        lst.add( "thread", getThreadInfo( ti, tmbean ) );
+        if (ti != null) {
+          lst.add( "thread", getThreadInfo( ti, tmbean ) );
+        }
       }
       system.add( "deadlocks", lst );
     }
@@ -72,7 +74,9 @@ public class ThreadDumpHandler extends R
     tinfos = tmbean.getThreadInfo(tids, Integer.MAX_VALUE);
     NamedList<SimpleOrderedMap<Object>> lst = new NamedList<SimpleOrderedMap<Object>>();
     for (ThreadInfo ti : tinfos) {
-      lst.add( "thread", getThreadInfo( ti, tmbean ) );
+      if (ti != null) {
+        lst.add( "thread", getThreadInfo( ti, tmbean ) );
+      }
     }
     system.add( "threadDump", lst );
     rsp.setHttpCaching(false);



Mime
View raw message