fixed for graceful error handling (i.e. the compiler doesn't dump stack ;-)

in response to tests now moved out of failing

2 files changed, 2 insertions, 1 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java
index 166a44cd8..3697f6be7 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java
@@ -177,6 +177,7 @@ public class AccessForInlineVisitor extends AbstractSyntaxTreeVisitorAdapter {
 	}
 
 	private void makePublic(TypeBinding binding) {
+		if (binding == null || !binding.isValidBinding()) return;  // has already produced an error
 		if (binding instanceof ReferenceBinding) {
 			ReferenceBinding rb = (ReferenceBinding)binding;
 			if (!rb.isPublic()) handler.notePrivilegedTypeAccess(rb, null); //???
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java
index ef833b13e..2c45f3d1a 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java
@@ -137,7 +137,7 @@ public class InterTypeFieldDeclaration extends InterTypeDeclaration {
 		EclipseFactory world = EclipseFactory.fromScopeLookupEnvironment(classScope);
 		resolveOnType(classScope);
 		
-		if (classScope.referenceContext.binding == null) return null;
+		if (ignoreFurtherInvestigation) return null;
 		
 		binding = classScope.referenceContext.binding.resolveTypesFor(binding);
 		if (ignoreFurtherInvestigation) return null;