aboutsummaryrefslogtreecommitdiffstats
path: root/org.aspectj.ajdt.core
diff options
context:
space:
mode:
authoraclement <aclement>2006-03-27 21:39:46 +0000
committeraclement <aclement>2006-03-27 21:39:46 +0000
commitfa2ed1b8d8350afe051a21a510fb4fc929d5f43d (patch)
treee8fbf7fef55afb975e1ca426a84a6c4bea8d2a9f /org.aspectj.ajdt.core
parent638db357bdf26a8afb6699c84002762fa7d4e518 (diff)
downloadaspectj-fa2ed1b8d8350afe051a21a510fb4fc929d5f43d.tar.gz
aspectj-fa2ed1b8d8350afe051a21a510fb4fc929d5f43d.zip
fix for NPE in pr132087
Diffstat (limited to 'org.aspectj.ajdt.core')
-rw-r--r--org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
index aab7815d2..11aaf9aa1 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
@@ -399,7 +399,10 @@ public class AsmHierarchyBuilder extends ASTVisitor {
if (peNode.getKind().equals(IProgramElement.Kind.INTER_TYPE_FIELD)) {
peNode.setCorrespondingType(methodDeclaration.returnType.toString());
} else {
- peNode.setCorrespondingType(methodDeclaration.returnType.resolvedType.debugName());
+ if (methodDeclaration.returnType.resolvedType!=null)
+ peNode.setCorrespondingType(methodDeclaration.returnType.resolvedType.debugName());
+ else
+ peNode.setCorrespondingType(null);
}
} else {
peNode.setCorrespondingType(null);