### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core.tests.model Index: src/org/eclipse/jdt/core/tests/dom/BatchASTCreationTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/BatchASTCreationTests.java,v retrieving revision 1.65 diff -u -r1.65 BatchASTCreationTests.java --- src/org/eclipse/jdt/core/tests/dom/BatchASTCreationTests.java 25 Oct 2006 13:01:14 -0000 1.65 +++ src/org/eclipse/jdt/core/tests/dom/BatchASTCreationTests.java 25 Oct 2006 14:02:25 -0000 @@ -1655,7 +1655,7 @@ } // https://bugs.eclipse.org/bugs/show_bug.cgi?id=159631 -public void _test073() throws CoreException, IOException { +public void test073() throws CoreException, IOException { try { IJavaProject project = createJavaProject("P072", new String[] {}, Util.getJavaClassLibs(), "", "1.5"); ICompilationUnit compilationUnits[] = new ICompilationUnit[3]; #P org.eclipse.jdt.core Index: compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java,v retrieving revision 1.139 diff -u -r1.139 SourceTypeBinding.java --- compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java 23 Oct 2006 08:01:16 -0000 1.139 +++ compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java 25 Oct 2006 14:02:27 -0000 @@ -1430,7 +1430,10 @@ return this.scope.referenceContext.sourceStart; } SimpleLookupTable storedAnnotations(boolean forceInitialize) { - if (forceInitialize && this.storedAnnotations == null) { + if (forceInitialize && this.storedAnnotations == null && + this.scope != null) { + // once scope is null, no more attempt to store annotations - + // as if the scope was present with storeAnnotations set to false this.scope.referenceCompilationUnit().compilationResult.hasAnnotations = true; if (!this.scope.environment().globalOptions.storeAnnotations) return null; // not supported during this compile