Bug 515473 - [1.8] Bogus resource leak warning caused by return

statement in lambda

Change-Id: I54b4995af6d4d963272d3a5176832488e39a18e8

2 files changed, 31 insertions, 1 deletions

diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LambdaExpressionsTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LambdaExpressionsTest.java
index 37023f15de..0d9f6a1455 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LambdaExpressionsTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LambdaExpressionsTest.java
@@ -6416,6 +6416,36 @@ public void testBug514105() {
 			"public class FunctionalInterfaceBug {}\n"
 		});
 }
+public void testBug515473() {
+	runConformTest(
+		new String[] {
+			"test/LambdaResourceLeak.java",
+			"package test;\n" +
+			"\n" +
+			"class X implements AutoCloseable {\n" +
+			"	@Override\n" +
+			"	public void close() {\n" +
+			"	}\n" +
+			"}\n" +
+			"\n" +
+			"interface SAM {\n" +
+			"	Object m();\n" +
+			"}\n" +
+			"\n" +
+			"public class LambdaResourceLeak {\n" +
+			"	void f() {\n" +
+			"		X x1 = new X();\n" +
+			"		SAM sam = () -> {\n" +
+			"			return \"\";\n" +
+			"		};\n" +
+			"		sam.m();\n" +
+			"		x1.close();\n" +
+			"	}\n" +
+			"}\n" +
+			"",
+		}
+	);
+}
 public static Class testClass() {
 	return LambdaExpressionsTest.class;
 }
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BlockScope.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BlockScope.java
index 3f5b926ae8..32de2db36c 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BlockScope.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BlockScope.java
@@ -1072,7 +1072,7 @@ public void checkUnclosedCloseables(FlowInfo flowInfo, FlowContext flowContext,
 	if (!compilerOptions().analyseResourceLeaks) return;
 	if (this.trackingVariables == null) {
 		// at a method return we also consider enclosing scopes
-		if (location != null && this.parent instanceof BlockScope)
+		if (location != null && this.parent instanceof BlockScope && !isLambdaScope())
 			((BlockScope) this.parent).checkUnclosedCloseables(flowInfo, flowContext, location, locationScope);
 		return;
 	}