From db2d82b9ec20047661592f2bf6924e9321da7423 Mon Sep 17 00:00:00 2001
From: broDom <devnull@localhost>
Date: Mon, 3 Jul 2017 16:59:46 +0200
Subject: [PATCH] refactor: use try-with-resources

---
 .../sonia/scm/web/proxy/ProxyServlet.java     | 26 +++++--------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/web/proxy/ProxyServlet.java b/scm-core/src/main/java/sonia/scm/web/proxy/ProxyServlet.java
index 1d865dc4bc..06059c2926 100644
--- a/scm-core/src/main/java/sonia/scm/web/proxy/ProxyServlet.java
+++ b/scm-core/src/main/java/sonia/scm/web/proxy/ProxyServlet.java
@@ -40,28 +40,20 @@ import com.google.common.io.ByteStreams;
 import com.google.common.io.Closer;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-//~--- JDK imports ------------------------------------------------------------
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
 import java.net.HttpURLConnection;
-
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+//~--- JDK imports ------------------------------------------------------------
 
 /**
  *
@@ -175,10 +167,8 @@ public class ProxyServlet extends HttpServlet
   private void copyContent(HttpURLConnection con, HttpServletResponse response)
     throws IOException
   {
-    Closer closer = Closer.create();
 
-    try
-    {
+    try (Closer closer = Closer.create()) {
       InputStream webToProxyBuf =
         closer.register(new BufferedInputStream(con.getInputStream()));
       OutputStream proxyToClientBuf =
@@ -188,10 +178,6 @@ public class ProxyServlet extends HttpServlet
 
       logger.trace("copied {} bytes for proxy", bytes);
     }
-    finally
-    {
-      closer.close();
-    }
   }
 
   /**