Merge pull request #1 from openamiguel/openamiguel-patch-1

Update WrongOneof.java
openamiguel · Jul 27, 2021 · 148cf4d · 148cf4d
2 parents 4e91cb4 + c5ee51c
commit 148cf4d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/WrongOneof.java b/core/src/main/java/com/google/errorprone/bugpatterns/WrongOneof.java
@@ -44,11 +44,13 @@
 import com.sun.source.tree.IdentifierTree;
 import com.sun.source.tree.MemberSelectTree;
 import com.sun.source.tree.MethodInvocationTree;
+import com.sun.source.tree.StatementTree;
 import com.sun.source.tree.SwitchTree;
 import com.sun.source.util.TreePath;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Symbol.VarSymbol;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
@@ -100,8 +102,9 @@ public Description matchSwitch(SwitchTree tree, VisitorState state) {
 
       scanForInvalidGetters(getters, allowableGetters, caseTree, receiverSymbolChain.get(), state);
 
-      if (!caseTree.getStatements().isEmpty()
-          && !canCompleteNormally(getLast(caseTree.getStatements()))) {
+      List<? extends StatementTree> statements = caseTree.getStatements();
+      if (statements != null && !statements.isEmpty()
+          && !canCompleteNormally(getLast(statements))) {
         allowableGetters.clear();
       }
     }