Index: compiler/org/eclipse/jdt/internal/compiler/CompilationResult.java
===================================================================
RCS file: /home/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/CompilationResult.java,v
retrieving revision 1.41.2.3
diff -u -r1.41.2.3 CompilationResult.java
--- compiler/org/eclipse/jdt/internal/compiler/CompilationResult.java	5 Jul 2005 13:47:39 -0000	1.41.2.3
+++ compiler/org/eclipse/jdt/internal/compiler/CompilationResult.java	7 Sep 2005 16:07:08 -0000
@@ -115,12 +115,12 @@
 			} else {
 				priority += P_OUTSIDE_METHOD;
 			}
+			if (firstErrors.contains(problem)){ // if context is null, firstErrors is null too
+			  priority += P_FIRST_ERROR;
+		    }
 		} else {
 			priority += P_OUTSIDE_METHOD;
 		}
-		if (firstErrors.contains(problem)){
-			priority += P_FIRST_ERROR;
-		}
 		return priority;
 	}
 
@@ -147,6 +147,7 @@
 				removed++;
 				problems[i] = null;
 				if (problemsMap != null) problemsMap.remove(problem);
+				if (firstErrors != null) firstErrors.remove(problem);
 				continue nextProblem;
 			}
 		}
@@ -450,6 +451,7 @@
 
 		this.hasBeenAccepted = true;
 		this.problemsMap = null; // flush
+		this.firstErrors = null; // flush
 		return this;
 	}