--- a/jdk/src/share/classes/java/io/FilterOutputStream.java	Wed Aug 17 22:47:12 2011 -0700
+++ b/jdk/src/share/classes/java/io/FilterOutputStream.java	Thu Aug 18 16:47:20 2011 +0100
@@ -152,11 +152,10 @@
      * @see        java.io.FilterOutputStream#flush()
      * @see        java.io.FilterOutputStream#out
      */
+    @SuppressWarnings("try")
     public void close() throws IOException {
-        try {
-          flush();
-        } catch (IOException ignored) {
+        try (OutputStream ostream = out) {
+            flush();
         }
-        out.close();
     }
 }