QPID-5993 : Fix more findbugs found issues

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1617822 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 13 insertions, 12 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java
index d8f8e4e4b0..2f6f55e042 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java
@@ -61,23 +61,24 @@ public class DefinedFileServlet extends HttpServlet
     {
         try (OutputStream output = HttpManagementUtil.getOutputStream(request, response))
         {
-            InputStream fileInput = getClass().getResourceAsStream("/resources/" + _filename);
-
-            if (fileInput != null)
+            try(InputStream fileInput = getClass().getResourceAsStream("/resources/" + _filename))
             {
-                byte[] buffer = new byte[1024];
-                response.setStatus(HttpServletResponse.SC_OK);
-                int read = 0;
+                if (fileInput != null)
+                {
+                    byte[] buffer = new byte[1024];
+                    response.setStatus(HttpServletResponse.SC_OK);
+                    int read = 0;
 
-                while ((read = fileInput.read(buffer)) > 0)
+                    while ((read = fileInput.read(buffer)) > 0)
+                    {
+                        output.write(buffer, 0, read);
+                    }
+                }
+                else
                 {
-                    output.write(buffer, 0, read);
+                    response.sendError(HttpServletResponse.SC_NOT_FOUND, "unknown file: " + _filename);
                 }
             }
-            else
-            {
-                response.sendError(HttpServletResponse.SC_NOT_FOUND, "unknown file: " + _filename);
-            }
         }
     }
 }