Merge pull request google#953 from zlosch/fix-equals

Add missing null-check to fulfill equals contract
sukk11 · Dec 22, 2015 · b18f23f · b18f23f
2 parents f4985ec + 64ea331
commit b18f23f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/extensions/grapher/src/com/google/inject/grapher/NodeId.java b/extensions/grapher/src/com/google/inject/grapher/NodeId.java
@@ -69,7 +69,7 @@ public Key<?> getKey() {
   }
 
   @Override public boolean equals(Object obj) {
-    if (!(obj.getClass().equals(NodeId.class))) {
+    if (obj == null || !(obj.getClass().equals(NodeId.class))) {
       return false;
     }
     NodeId other = (NodeId) obj;

diff --git a/extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java b/extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java
@@ -831,7 +831,7 @@ public RealMapBinderProviderWithDependencies(Object equality) {
 
       @Override
       public boolean equals(Object obj) {
-        return this.getClass() == obj.getClass() &&
+        return obj != null && this.getClass() == obj.getClass() &&
           equality.equals(((RealMapBinderProviderWithDependencies<?>)obj).equality);
       }
 

diff --git a/extensions/multibindings/src/com/google/inject/multibindings/OptionalBinder.java b/extensions/multibindings/src/com/google/inject/multibindings/OptionalBinder.java
@@ -687,7 +687,7 @@ public RealOptionalBinderProviderWithDependencies(Object equality) {
       }
 
       @Override public boolean equals(Object obj) {
-        return this.getClass() == obj.getClass()
+        return obj != null && this.getClass() == obj.getClass()
             && equality.equals(((RealOptionalBinderProviderWithDependencies<?>) obj).equality);
       }