From: aclement <aclement>
Date: Mon, 27 Mar 2006 21:39:46 +0000 (+0000)
Subject: fix for NPE in pr132087
X-Git-Tag: V1_5_1_final~19
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fa2ed1b8d8350afe051a21a510fb4fc929d5f43d;p=aspectj.git

fix for NPE in pr132087
---

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);