fix(java_indexer): guard against NPE in ImmutableList (#5310)

1 files changed, 5 insertions, 4 deletions

diff --git a/kythe/java/com/google/devtools/kythe/analyzers/java/KytheTreeScanner.java b/kythe/java/com/google/devtools/kythe/analyzers/java/KytheTreeScanner.java
index 3ec372155..cdef86ceb 100644
--- a/kythe/java/com/google/devtools/kythe/analyzers/java/KytheTreeScanner.java
+++ b/kythe/java/com/google/devtools/kythe/analyzers/java/KytheTreeScanner.java
@@ -660,10 +660,8 @@ public class KytheTreeScanner extends JCTreeScanner<JavaNode, TreeContext> {
     emitAnchor(ctx, EdgeKind.DEFINES, lambdaNode);
 
     for (Type target : getTargets(lambda)) {
-      if (target != null) {
-        VName targetNode = getNode(target.asElement());
-        entrySets.emitEdge(lambdaNode, EdgeKind.EXTENDS, targetNode);
-      }
+      VName targetNode = getNode(target.asElement());
+      entrySets.emitEdge(lambdaNode, EdgeKind.EXTENDS, targetNode);
     }
 
     scan(lambda.body, ctx);
@@ -672,6 +670,9 @@ public class KytheTreeScanner extends JCTreeScanner<JavaNode, TreeContext> {
   }
 
   private static Iterable<Type> getTargets(JCFunctionalExpression node) {
+    if (node == null || node.target == null) {
+      return ImmutableList.of();
+    }
     return ImmutableList.of(node.target);
   }