From: tang peng <tang.peng5@zte.com.cn>
Date: Fri, 3 Aug 2018 01:22:09 +0000 (+0000)
Subject: Merge "Fixed some UI bugs"
X-Git-Tag: 1.2.0~31
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=252b165afc61d8bd415c32565dadb404c27ac5ca;hp=2f6d3758fbc70ee6aac10063a8784a0f34c48a4d;p=holmes%2Frule-management.git

Merge "Fixed some UI bugs"
---

diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/SwaggerResource.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/SwaggerResource.java
index 8376daf..83555b2 100644
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/SwaggerResource.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/SwaggerResource.java
@@ -18,11 +18,8 @@ package org.onap.holmes.rulemgt.resources;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.SwaggerDefinition;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
+
+import java.io.*;
 import java.net.URL;
 import java.net.URLDecoder;
 import javax.ws.rs.GET;
@@ -44,12 +41,15 @@ public class SwaggerResource {
         URL url = SwaggerResource.class.getResource("/swagger.json");
         String ret = "{}";
 
-        BufferedReader br = null;
+        File file;
         try {
             System.out.println(URLDecoder.decode(url.getPath(), "UTF-8"));
-            File file = new File(URLDecoder.decode(url.getPath(), "UTF-8"));
-
-            br = new BufferedReader(new FileReader(file));
+            file = new File(URLDecoder.decode(url.getPath(), "UTF-8"));
+        } catch(IOException e) {
+            log.warn("An error occurred while reading swagger.json.", e);
+            return ret;
+        }
+        try(BufferedReader br = new BufferedReader(new FileReader(file));)  {
             StringBuffer buffer = new StringBuffer();
             String line = " ";
             while ((line = br.readLine()) != null) {
@@ -60,16 +60,7 @@ public class SwaggerResource {
             log.warn("Failed to read the API description file.", e);
         } catch (IOException e) {
             log.warn("An error occurred while reading swagger.json.", e);
-        }  finally {
-            if (br != null) {
-                try {
-                    br.close();
-                } catch (IOException e) {
-                    log.warn("Failed to close the file reader. This may cause memory leak.");
-                }
-            }
         }
-
         return ret;
     }
 }