diff options
| author | Stephan Herrmann | 2013-09-07 10:30:39 +0000 |
|---|---|---|
| committer | Stephan Herrmann | 2013-09-07 10:30:39 +0000 |
| commit | 37fcbb14dd95f7f477156cd46527c4704fd7e487 (patch) | |
| tree | 8c8284c003dba0b8b8e758b78352e91861da19f6 | |
| parent | 03573185f71efe39c64717948bfdc42f5b1e9ae4 (diff) | |
| download | org.eclipse.objectteams-37fcbb14dd95f7f477156cd46527c4704fd7e487.tar.gz org.eclipse.objectteams-37fcbb14dd95f7f477156cd46527c4704fd7e487.tar.xz org.eclipse.objectteams-37fcbb14dd95f7f477156cd46527c4704fd7e487.zip | |
Fix NPE triggered by ClassScope.checkParameterizedSuperTypeCollisions
| -rw-r--r-- | org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java index d97eed5ba..1614bc7dc 100644 --- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java +++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java @@ -1792,14 +1792,15 @@ public class ClassScope extends Scope { sourceType.baseclass = null; return true; } else { + // only want to reach here when no errors are reported + sourceType.baseclass = baseclass; + RoleModel roleModel = sourceType.roleModel; roleModel._state.addJob(ITranslationStates.STATE_ROLES_LINKED, new Runnable() { public void run() { checkBaseClassRedefinition(ClassScope.this.referenceContext); } }); - // only want to reach here when no errors are reported - sourceType.baseclass = baseclass; char[] packageName = baseclass.compoundName[0]; if ( CharOperation.equals(packageName, "java".toCharArray()) //$NON-NLS-1$ |