Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-9967: don't throw NullPointerException while handling a different root-cause exception in ReplicaNode.start

This commit is contained in:
Mike McCandless 2021-05-24 10:51:26 -04:00
parent f7fbb9eda5
commit 654e978190
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lucene/CHANGES.txt
View File

@ -229,7 +229,6 @@ Improvements
Bug fixes Bug fixes
* LUCENE-9686: Fix read past EOF handling in DirectIODirectory. (Zach Chen, * LUCENE-9686: Fix read past EOF handling in DirectIODirectory. (Zach Chen,
Julie Tibshirani) Julie Tibshirani)
@ -395,6 +394,9 @@ Bug Fixes
the total count for a dimension. Prior to this fix, multi-value docs could contribute a > 1 the total count for a dimension. Prior to this fix, multi-value docs could contribute a > 1
count to the dimension count. (Greg Miller) count to the dimension count. (Greg Miller)
* LUCEDNE-9967: Do not throw NullPointerException while trying to handle another exception in
ReplicaNode.start (Steven Schlansker)
Other Other
--------------------- ---------------------

3
lucene/replicator/src/java/org/apache/lucene/replicator/nrt/ReplicaNode.java
View File

@ -29,6 +29,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
@ -332,7 +333,7 @@ public abstract class ReplicaNode extends Node {
message("top: done start"); message("top: done start");
state = "idle"; state = "idle";
} catch (Throwable t) { } catch (Throwable t) {
if (t.getMessage().startsWith("replica cannot start") == false) { if (Objects.toString(t.getMessage()).startsWith("replica cannot start") == false) {
message("exc on start:"); message("exc on start:");
t.printStackTrace(printStream); t.printStackTrace(printStream);
} else { } else {