Quellcode durchsuchen

protect against NPE for inheritance and annotation style

tags/V1_9_8
Andy Clement vor 2 Jahren
Ursprung
Commit
a6697eca30

+ 2
- 3
org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java Datei anzeigen

} else { } else {
kind = null; kind = null;
} }
} else if (binding instanceof SourceTypeBinding) {
} else if (binding instanceof SourceTypeBinding && ((SourceTypeBinding)binding).scope != null) {
SourceTypeBinding sourceSc = (SourceTypeBinding) binding; SourceTypeBinding sourceSc = (SourceTypeBinding) binding;
if (sourceSc.scope.referenceContext instanceof AspectDeclaration) { if (sourceSc.scope.referenceContext instanceof AspectDeclaration) {
// code style // code style
kind = ((AspectDeclaration) sourceSc.scope.referenceContext).perClause.getKind(); kind = ((AspectDeclaration) sourceSc.scope.referenceContext).perClause.getKind();
} else { // if (sourceSc.scope.referenceContext instanceof
// TypeDeclaration) {
} else { // if (sourceSc.scope.referenceContext instanceof TypeDeclaration) {
// if @Aspect: perFromSuper, else if @Aspect(..) get from anno // if @Aspect: perFromSuper, else if @Aspect(..) get from anno
// value, else null // value, else null
kind = getPerClauseForTypeDeclaration((sourceSc.scope.referenceContext)); kind = getPerClauseForTypeDeclaration((sourceSc.scope.referenceContext));

Laden…
Abbrechen
Speichern