Fix NPE in ReachabilityFenceUsage

Fixes #2641 PiperOrigin-RevId: 415451162
google · Dec 10, 2021 · 4b7ccd7 · 4b7ccd7
1 parent 88effaa
commit 4b7ccd7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ReachabilityFenceUsage.java b/core/src/main/java/com/google/errorprone/bugpatterns/ReachabilityFenceUsage.java
@@ -29,6 +29,7 @@
 import com.sun.source.tree.MethodInvocationTree;
 import com.sun.source.tree.Tree;
 import com.sun.source.tree.TryTree;
+import java.util.Objects;
 
 /** A {@link BugChecker}; see the associated {@link BugPattern} annotation for details. */
 @BugPattern(
@@ -50,7 +51,7 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState
     for (Tree enclosing : state.getPath().getParentPath()) {
       switch (enclosing.getKind()) {
         case TRY:
-          if (((TryTree) enclosing).getFinallyBlock().equals(previous)) {
+          if (Objects.equals(((TryTree) enclosing).getFinallyBlock(), previous)) {
             return NO_MATCH;
           }
           break;

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/ReachabilityFenceUsageTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/ReachabilityFenceUsageTest.java
@@ -47,6 +47,24 @@ public void positive() {
         .doTest();
   }
 
+  @Test
+  public void positive_try() {
+    assumeTrue(RuntimeVersion.isAtLeast9());
+    compilationTestHelper
+        .addSourceLines(
+            "Test.java",
+            "import java.lang.ref.Reference;",
+            "class Test {",
+            "  public void run() {",
+            "    try {",
+            "      // BUG: Diagnostic contains:",
+            "      Reference.reachabilityFence(this);",
+            "    } catch (Exception e) {}",
+            "  }",
+            "}")
+        .doTest();
+  }
+
   @Test
   public void negative() {
     assumeTrue(RuntimeVersion.isAtLeast9());