HEAD - Fixed bug 342936: NPEs and inconsistencies when running jdt.compiler.tool.tests against Java 7

3 files changed, 13 insertions, 5 deletions

diff --git a/batch/org/eclipse/jdt/internal/compiler/batch/Main.java b/batch/org/eclipse/jdt/internal/compiler/batch/Main.java
index a2c215738..c40c61c0d 100644
--- a/batch/org/eclipse/jdt/internal/compiler/batch/Main.java
+++ b/batch/org/eclipse/jdt/internal/compiler/batch/Main.java
@@ -1328,7 +1328,7 @@ public class Main implements ProblemSeverities, SuffixConstants {
 
 	private PrintWriter err;
 
-	ArrayList extraProblems;
+	protected ArrayList extraProblems;
 	public final static String bundleName = "org.eclipse.jdt.internal.compiler.batch.messages"; //$NON-NLS-1$
 	// two uses: recognize 'none' in options; code the singleton none
 	// for the '-d none' option (wherever it may be found)
@@ -3740,7 +3740,7 @@ public void performCompilation() {
 	}
 
 	if (this.extraProblems != null) {
-		this.logger.loggingExtraProblems(this);
+		loggingExtraProblems();
 		this.extraProblems = null;
 	}
 	if (this.compilerStats != null) {
@@ -3751,6 +3751,9 @@ public void performCompilation() {
 	// cleanup
 	environment.cleanup();
 }
+protected void loggingExtraProblems() {
+	this.logger.loggingExtraProblems(this);
+}
 public void printUsage() {
 	printUsage("misc.usage"); //$NON-NLS-1$
 }
diff --git a/buildnotes_jdt-core.html b/buildnotes_jdt-core.html
index b8e36e6ef..e3013ef06 100644
--- a/buildnotes_jdt-core.html
+++ b/buildnotes_jdt-core.html
@@ -51,7 +51,9 @@ Eclipse SDK 3.7M7 - %date% - 3.7.0 M7
 <h2>What's new in this drop</h2>
 
 <h3>Problem Reports Fixed</h3>
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=342455">342455</a>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=342936">342936</a>
+NPEs and inconsistencies when running jdt.compiler.tool.tests against Java 7
+<br><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=342455">342455</a>
 AST swallows stars ('*') at end of {@code} and {@literal} Javadoc fragments
 <br><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=342757">342757</a>
 ArrayIndexOutOfBoundsException in MethodInfoWithParameterAnnotations.getParameterAnnotations when generating method info for an inner class constructor with annotated parameter
diff --git a/compiler/org/eclipse/jdt/internal/compiler/problem/DefaultProblem.java b/compiler/org/eclipse/jdt/internal/compiler/problem/DefaultProblem.java
index cb60397e1..77f2bbfe0 100644
--- a/compiler/org/eclipse/jdt/internal/compiler/problem/DefaultProblem.java
+++ b/compiler/org/eclipse/jdt/internal/compiler/problem/DefaultProblem.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,7 +18,10 @@ import org.eclipse.jdt.internal.compiler.util.Util;
 public class DefaultProblem extends CategorizedProblem {
 	private char[] fileName;
 	private int id;
-	private int startPosition, endPosition, line, column;
+	private int startPosition;
+	private int endPosition;
+	private int line;
+	public int column;
 	private int severity;
 	private String[] arguments;
 	private String message;