Merge
authorlana
Fri, 01 Apr 2011 10:17:56 -0700
changeset 9081 282d5ac0914e
parent 9080 f9def32bc135 (current diff)
parent 9079 e512a7712be3 (diff)
child 9082 53409a3a93f8
Merge
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Mar 31 22:08:44 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java	Fri Apr 01 10:17:56 2011 -0700
@@ -2289,6 +2289,7 @@
                 sitesym.kind == VAR &&
                 ((VarSymbol)sitesym).isResourceVariable() &&
                 sym.kind == MTH &&
+                sym.name.equals(names.close) &&
                 sym.overrides(syms.autoCloseableClose, sitesym.type.tsym, types, true) &&
                 env.info.lint.isEnabled(LintCategory.TRY)) {
             log.warning(LintCategory.TRY, tree, "try.explicit.close.call");
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/TryWithResources/T7032633.java	Fri Apr 01 10:17:56 2011 -0700
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 7032633
+ * @summary javac -Xlint:all warns about flush() within try on an auto-closeable resource
+ * @compile -Xlint:try -Werror T7032633.java
+ */
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class T7032633 {
+    void test() throws IOException {
+        try (OutputStream out = System.out) {
+            out.flush();
+        }
+    }
+}