Adds a ?null check and return false? code block in equals() method overridden by classes which would?ve otherwise thrown an NPE.

PiperOrigin-RevId: 196680390

1 files changed, 9 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkType.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkType.java
index 9e394d977d..524f06e4d5 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkType.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkType.java
@@ -247,6 +247,9 @@ public abstract class SkylarkType implements Serializable {
       return type;
     }
     @Override public boolean equals(Object other) {
+      if (other == null) {
+        return false;
+      }
       return this == other
           || (this.getClass() == other.getClass() && this.type.equals(((Simple) other).getType()));
     }
@@ -359,6 +362,9 @@ public abstract class SkylarkType implements Serializable {
     }
 
     @Override public boolean equals(Object other) {
+      if (other == null) {
+        return false;
+      }
       if (this == other) {
         return true;
       } else if (this.getClass() == other.getClass()) {
@@ -424,6 +430,9 @@ public abstract class SkylarkType implements Serializable {
       return false;
     }
     @Override public boolean equals(Object other) {
+      if (other == null) {
+        return false;
+      }
       if (this.getClass() == other.getClass()) {
         Union o = (Union) other;
         if (types.containsAll(o.types) && o.types.containsAll(types)) {