commit 0d8d4cf53963a7b870596a8daac85f32a2d51d69
author lberki <lberki@google.com> Tue Sep 05 16:01:44 2017 +0200
committer Yun Peng <pcloudy@google.com> Wed Sep 06 10:09:53 2017 +0200
tree ed60453947924c466854cdc217f949d49cfefb88
parent 3dd5683e84a2e37852d2aaf820116eead59abad5

Fix assorted ErrorProne warnings.

RELNOTES: None.
PiperOrigin-RevId: 167574104

src/main/java/com/google/devtools/build/lib/packages/Package.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/Package.java b/src/main/java/com/google/devtools/build/lib/packages/Package.java
index 9e4ab19..8a17fbd 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Package.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Package.java
@@ -47,6 +47,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import javax.annotation.Nullable;
 
@@ -1167,7 +1168,7 @@
       }
       if (!((InputFile) cacheInstance).isVisibilitySpecified()
           || cacheInstance.getVisibility() != visibility
-          || cacheInstance.getLicense() != license) {
+          || !Objects.equals(cacheInstance.getLicense(), license)) {
         targets.put(filename, new InputFile(
             pkg, cacheInstance.getLabel(), cacheInstance.getLocation(), visibility, license));
       }