From a7185a1d319488e602be3af8c2e9731e733a0886 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Fri, 15 Jan 2016 12:31:12 -0500 Subject: [PATCH] Simplify equality test in IndexShard#sameException This commit simplifies an equality test in IndexShard#sameException where the messages for two exceptions are being compared. The previous condition first tested logical equality if the left exception is not null, and otherwise tested reference equality. There is a convenience method since JDK 7 for testing equality in this way: Objects#equals. Closes #16025 --- core/src/main/java/org/elasticsearch/index/IndexService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/index/IndexService.java b/core/src/main/java/org/elasticsearch/index/IndexService.java index 6b79846d0f4..05893ae3813 100644 --- a/core/src/main/java/org/elasticsearch/index/IndexService.java +++ b/core/src/main/java/org/elasticsearch/index/IndexService.java @@ -25,6 +25,7 @@ import java.nio.file.Path; import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -715,8 +716,7 @@ public final class IndexService extends AbstractIndexComponent implements IndexC private static boolean sameException(Exception left, Exception right) { if (left.getClass() == right.getClass()) { - if ((left.getMessage() != null && left.getMessage().equals(right.getMessage())) - || left.getMessage() == right.getMessage()) { + if (Objects.equals(left.getMessage(), right.getMessage())) { StackTraceElement[] stackTraceLeft = left.getStackTrace(); StackTraceElement[] stackTraceRight = right.getStackTrace(); if (stackTraceLeft.length == stackTraceRight.length) {