aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2005-09-30 12:56:45 +0000
committeraclement <aclement>2005-09-30 12:56:45 +0000
commitbc66b0bac908d0d89a8b6418c366502338d91474 (patch)
treebacfc221f0e57da9d867629cf5f4d3b832c515e3
parent395cf569c1e790061db435be7209ee03f3ee82c6 (diff)
downloadaspectj-bc66b0bac908d0d89a8b6418c366502338d91474.tar.gz
aspectj-bc66b0bac908d0d89a8b6418c366502338d91474.zip
avoid unpleasant NPE (see pr110307)
-rw-r--r--org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
index 71c5d6085..89099dc57 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
@@ -740,9 +740,9 @@ public class AjLookupEnvironment extends LookupEnvironment implements AnonymousC
private void addParent(SourceTypeBinding sourceType, ResolvedType parent) {
ReferenceBinding parentBinding = (ReferenceBinding)factory.makeTypeBinding(parent);
-
+ if (parentBinding == null) return; // The parent is missing, it will be reported elsewhere.
sourceType.rememberTypeHierarchy();
- if (parentBinding.isClass()) {
+ if (parentBinding.isClass()) {
sourceType.superclass = parentBinding;
// this used to be true, but I think I've fixed it now, decp is done at weave time!