From 2ed766cd9f95b400c69db07eedde69035877113c Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Fri, 5 May 2006 08:29:41 +0000
Subject: test for 136393: NPE on funky ITD ctor

---
 .../ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'org.aspectj.ajdt.core')

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java
index fec167383..ba043df9f 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java
@@ -180,7 +180,8 @@ public class InterTypeConstructorDeclaration extends InterTypeDeclaration {
 		MethodBinding explicitConstructor = null;
 		if (explicitConstructorCall != null) {
 			explicitConstructor = explicitConstructorCall.binding;
-			if (explicitConstructor.alwaysNeedsAccessMethod()) {
+			// If it is null then we are going to report something else is wrong with this code!
+			if (explicitConstructor!=null && explicitConstructor.alwaysNeedsAccessMethod()) {
 				explicitConstructor = explicitConstructor.getAccessMethod(true);
 			}
 		}
@@ -305,13 +306,12 @@ public class InterTypeConstructorDeclaration extends InterTypeDeclaration {
 	
 	
 	private AjAttribute makeAttribute(EclipseFactory world) {
-		if (explicitConstructorCall != null && !(explicitConstructorCall.binding instanceof ProblemMethodBinding)) {
+		if (explicitConstructorCall != null && (explicitConstructorCall.binding!=null) && !(explicitConstructorCall.binding instanceof ProblemMethodBinding)) {
 			MethodBinding explicitConstructor = explicitConstructorCall.binding;
 			if (explicitConstructor.alwaysNeedsAccessMethod()) {
 				explicitConstructor = explicitConstructor.getAccessMethod(true);
 			}
 			
-			
 			((NewConstructorTypeMunger)munger).setExplicitConstructor(
 				world.makeResolvedMember(explicitConstructor));
 		} else {
-- 
cgit v1.2.3