better proteciton against throwables with no message in assertions

2016-02-14 18:06:53 +01:00 · 2016-02-14 18:06:53 +01:00 · 7bb85e45c7
parent 285c3bfa53
commit 7bb85e45c7
1 changed files with 2 additions and 1 deletions
--- a/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
+++ b/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
@ -1041,7 +1041,8 @@ public abstract class TransportReplicationAction<Request extends ReplicationRequ
                                                }
                                                forceFinishAsFailed(new RetryOnPrimaryException(shardId, message, shardFailedError));
                                            } else {
-                                                assert shardFailedError.getMessage().contains("TransportService is closed") :
+                                                assert shardFailedError.getMessage() != null &&
+                                                        shardFailedError.getMessage().contains("TransportService is closed") :
                                                        shardFailedError;
                                                onReplicaFailure(nodeId, exp);
                                            }