You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2015/12/29 18:50:33 UTC

svn commit: r1722197 - in /lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud: ChaosMonkeyNothingIsSafeTest.java ChaosMonkeySafeLeaderTest.java

Author: yonik
Date: Tue Dec 29 17:50:32 2015
New Revision: 1722197

URL: http://svn.apache.org/viewvc?rev=1722197&view=rev
Log:
SOLR-8472: tests - fix NPE in chaos tests debug hook

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java?rev=1722197&r1=1722196&r2=1722197&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java Tue Dec 29 17:50:32 2015
@@ -65,7 +65,8 @@ public class ChaosMonkeyNothingIsSafeTes
       public void call(Object... data) {
         Exception e = (Exception) data[0];
         if (e == null) return;
-        if (e.getMessage().contains("Timeout")) {
+        String msg = e.getMessage();
+        if (msg != null && msg.contains("Timeout")) {
           Diagnostics.logThreadDumps("REQUESTING THREAD DUMP DUE TO TIMEOUT: " + e.getMessage());
         }
       }

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java?rev=1722197&r1=1722196&r2=1722197&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java Tue Dec 29 17:50:32 2015
@@ -46,7 +46,8 @@ public class ChaosMonkeySafeLeaderTest e
       public void call(Object... data) {
         Exception e = (Exception) data[0];
         if (e == null) return;
-        if (e.getMessage().contains("Timeout")) {
+        String msg = e.getMessage();
+        if (msg != null && msg.contains("Timeout")) {
           Diagnostics.logThreadDumps("REQUESTING THREAD DUMP DUE TO TIMEOUT: " + e.getMessage());
         }
       }