From c5ee51c50d5ff9fed052e46cb892a087eb697973 Mon Sep 17 00:00:00 2001 From: openamiguel Date: Mon, 26 Jul 2021 21:31:21 -0400 Subject: [PATCH] Update WrongOneof.java --- .../java/com/google/errorprone/bugpatterns/WrongOneof.java | 7 +++++-- 1 file changed, 5 insertions(+), 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 index dc6435ab3bc..b706e46fa33 100644 --- 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 statements = caseTree.getStatements(); + if (statements != null && !statements.isEmpty() + && !canCompleteNormally(getLast(statements))) { allowableGetters.clear(); } }