Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2012-09-21 19:36:46 +0000
committerStephan Herrmann2012-09-21 19:36:46 +0000
commit2dfc53e4b1799ab0fec5dda486e2f16de0c298b0 (patch)
tree2363e672198cac7e42f5e9f1528a8e7043002e54
parent3ff346ae69442fe57a4b12f9fe776b4c471695eb (diff)
downloadorg.eclipse.objectteams-2dfc53e4b1799ab0fec5dda486e2f16de0c298b0.tar.gz
org.eclipse.objectteams-2dfc53e4b1799ab0fec5dda486e2f16de0c298b0.tar.xz
org.eclipse.objectteams-2dfc53e4b1799ab0fec5dda486e2f16de0c298b0.zip
Avoid an NPE seen in real life (callout binding had resolve error)
-rw-r--r--org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/DefaultBindingResolver.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/DefaultBindingResolver.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/DefaultBindingResolver.java
index ca4280161..bf21284cf 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/DefaultBindingResolver.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/DefaultBindingResolver.java
@@ -205,7 +205,8 @@ class DefaultBindingResolver extends BindingResolver {
for (Object bodyObj : roleType.bodyDeclarations()) {
if (bodyObj instanceof CalloutMappingDeclaration) {
// callout and method are considered "equal"
- if (((CalloutMappingDeclaration) bodyObj).resolveBinding().isEqualTo(binding))
+ IMethodMappingBinding calloutBinding = ((CalloutMappingDeclaration) bodyObj).resolveBinding();
+ if (calloutBinding != null && calloutBinding.isEqualTo(binding))
return (ASTNode)bodyObj;
}
}

Back to the top