R3_6_maintenance_Java7 - fixed bug 361441: Error in JDT Core during AST

creation

4 files changed, 41 insertions, 3 deletions

diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest_1_7.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest_1_7.java
index 4fddfd872f..c79521ef07 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest_1_7.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest_1_7.java
@@ -2302,6 +2302,28 @@ public void test0060a() {
 		false,
 		customOptions);
 }
+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=361441
+public void test0061() {
+	this.runNegativeTest(
+		new String[] {
+			"X.java",
+			"import java.net.URI;" +
+			"import java.nio.file.FileSystems;" +
+			"import java.util.Collections;\n" +
+			"public class X {\n" +
+			"	 public static void foo() {\n" +
+			"    	URI uri = URI.create(\"http://www.eclipse.org\");\n" +
+			"		FileSystems.<String, Object>newFileSystem(uri, Collections.emptyMap());\n" +
+			"	 }\n" +
+			"}\n"
+		},
+		"----------\n" + 
+		"1. ERROR in X.java (at line 5)\n" + 
+		"	FileSystems.<String, Object>newFileSystem(uri, Collections.emptyMap());\n" + 
+		"	                            ^^^^^^^^^^^^^\n" + 
+		"The method newFileSystem(URI, Map<String,?>) in the type FileSystems is not applicable for the arguments (URI, Map<Object,Object>)\n" + 
+		"----------\n");
+}
 public static Class testClass() {
 	return GenericsRegressionTest_1_7.class;
 }
diff --git a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
index bf153df39d..aee4ae049b 100644
--- a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
+++ b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
@@ -15,7 +15,7 @@
 #Format: compiler.name = word1 word2 word3
 compiler.name = Eclipse Compiler for Java(TM)
 #Format: compiler.version = 0.XXX[, other words (don't forget the comma if adding other words)]
-compiler.version = 0.B79_R36x_J7, 3.6.2+ Java7
+compiler.version = 0.B80_R36x_J7, 3.6.2+ Java7
 compiler.copyright = Copyright IBM Corp 2000, 2011. All rights reserved.
 
 ### progress
diff --git a/org.eclipse.jdt.core/buildnotes_jdt-core.html b/org.eclipse.jdt.core/buildnotes_jdt-core.html
index ba44132dd6..4baeeb3204 100644
--- a/org.eclipse.jdt.core/buildnotes_jdt-core.html
+++ b/org.eclipse.jdt.core/buildnotes_jdt-core.html
@@ -41,11 +41,24 @@
 	</td>
   </tr>
 </table>
+<a name="v_B80_R36x_J7"></a>
+<hr><h1>
+Eclipse Platform Build Notes<br>
+Java development tools core</h1>
+Eclipse SDK 3.6.50 - %date% - 3.6.50
+<br>Project org.eclipse.jdt.core v_B80_R36x_J7
+(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_B80_R36x_J7">cvs</a>).
+<h2>What's new in this drop</h2>
+
+<h3>Problem Reports Fixed</h3>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=361441">361441</a>
+Error in JDT Core during AST creation
+
 <a name="v_B79_R36x_J7"></a>
 <hr><h1>
 Eclipse Platform Build Notes<br>
 Java development tools core</h1>
-Eclipse SDK 3.6.50 - October 20, 2011 - 3.6.50
+Eclipse SDK 3.6.50 - October 20, 2011
 <br>Project org.eclipse.jdt.core v_B79_R36x_J7
 (<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_B79_R36x_J7">cvs</a>).
 <h2>What's new in this drop</h2>
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java
index 146c98fc00..0834015ce0 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java
@@ -578,7 +578,10 @@ public abstract class Scope {
 			}
 			return method;
 		}
-		if (genericTypeArguments != null)
+		// if method is generic and type arguments have been supplied, only then answer a problem 
+		// of ParameterizedMethodTypeMismatch, else a non-generic method was invoked using type arguments
+		// in which case this problem category will be bogus
+		if (genericTypeArguments != null && typeVariables != Binding.NO_TYPE_VARIABLES)
 			return new ProblemMethodBinding(method, method.selector, arguments, ProblemReasons.ParameterizedMethodTypeMismatch);
 		return null; // incompatible
 	}