Skip to content

Commit b2dd0c8

Browse files
committed
Check for nulls.
1 parent c9ea1c8 commit b2dd0c8

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

edu.cuny.hunter.streamrefactoring.eval/src/edu/cuny/hunter/streamrefactoring/eval/handlers/StreamMethodCallFinder.java

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.eclipse.jdt.core.dom.ASTNode;
2525
import org.eclipse.jdt.core.dom.ASTParser;
2626
import org.eclipse.jdt.core.dom.ASTVisitor;
27+
import org.eclipse.jdt.core.dom.IMethodBinding;
2728
import org.eclipse.jdt.core.dom.ITypeBinding;
2829
import org.eclipse.jdt.core.dom.MethodInvocation;
2930
import org.eclipse.jdt.core.dom.SimpleName;
@@ -91,15 +92,25 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
9192

9293
@Override
9394
public boolean visit(MethodInvocation node) {
94-
ITypeBinding declaringClass = node.resolveMethodBinding()
95-
.getDeclaringClass().getErasure();
95+
IMethodBinding binding = node.resolveMethodBinding();
9696

97-
if (declaringClass.getPackage().getName().startsWith("java.util.stream")) {
98-
String declaringClassName = declaringClass.getQualifiedName();
99-
SimpleName methodName = node.getName();
100-
String qualfiedMethodName = declaringClassName + "." + methodName;
97+
if (binding != null) {
98+
ITypeBinding declaringClass = binding.getDeclaringClass();
10199

102-
calledMethodNameToCount.merge(qualfiedMethodName, 1, Integer::sum);
100+
if (declaringClass != null) {
101+
declaringClass = declaringClass.getErasure();
102+
103+
if (declaringClass.getPackage().getName()
104+
.startsWith("java.util.stream")) {
105+
String declaringClassName = declaringClass.getQualifiedName();
106+
SimpleName methodName = node.getName();
107+
String qualfiedMethodName = declaringClassName + "."
108+
+ methodName;
109+
110+
calledMethodNameToCount.merge(qualfiedMethodName, 1,
111+
Integer::sum);
112+
}
113+
}
103114
}
104115
return super.visit(node);
105116
}

0 commit comments

Comments
 (0)