use java7 auto close

scm-webapp/src/main/java/sonia/scm/resources/AbstractResourceServlet.java

@@ -30,6 +30,7 @@
  */
 
 
+
 package sonia.scm.resources;
 
 //~--- non-JDK imports --------------------------------------------------------
@@ -151,21 +152,14 @@ public abstract class AbstractResourceServlet extends HttpServlet
   {
     response.setContentType(resource.getType().getContentType());
 
-    OutputStream output = null;
+    try (OutputStream output = response.getOutputStream())
-
-    try
     {
-      output = response.getOutputStream();
       resource.copyTo(output);
     }
-    finally
-    {
-      IOUtil.close(output);
-    }
   }
 
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
-  private ResourceManager resourceManager;
+  private final ResourceManager resourceManager;
 }

scm-webapp/src/main/java/sonia/scm/resources/DefaultResource.java

@@ -37,7 +37,6 @@ package sonia.scm.resources;
 
 import sonia.scm.plugin.PluginLoader;
 import sonia.scm.util.ChecksumUtil;
-import sonia.scm.util.IOUtil;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -72,19 +71,13 @@ public final class DefaultResource extends AbstractResource
     super(pluginLoader, resources, resourceHandlers);
     this.type = type;
 
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    try (ByteArrayOutputStream baos = new ByteArrayOutputStream())
-
-    try
     {
       appendResources(baos);
       this.content = baos.toByteArray();
       this.name = ChecksumUtil.createChecksum(this.content).concat(".").concat(
         type.getExtension());
     }
-    finally
-    {
-      IOUtil.close(baos);
-    }
   }
 
   //~--- methods --------------------------------------------------------------