Use Objects.equals

elastic · May 18, 2015 · 84c5af1 · 84c5af1
1 parent 959149f
commit 84c5af1
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java b/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java
@@ -20,7 +20,9 @@
 package org.elasticsearch.common.xcontent;
 
 import com.google.common.base.Charsets;
+import com.google.common.base.Objects;
 import com.google.common.collect.Maps;
+
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.common.bytes.BytesArray;
@@ -264,7 +266,7 @@ public static boolean update(Map<String, Object> source, Map<String, Object> cha
                 modified = true;
                 continue;
             }
-            modified = old == null ? changesEntry.getValue() != null : !old.equals(changesEntry.getValue());
+            modified = !Objects.equal(old, changesEntry.getValue());
         }
         return modified;
     }