Merge pull request #985 from hxy1991/fix_984

Fixes #984
alibaba · Apr 1, 2019 · adcc955 · adcc955
2 parents b1790fa + df4f338
commit adcc955
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/DiskUtil.java b/config/src/main/java/com/alibaba/nacos/config/server/service/DiskUtil.java
@@ -157,16 +157,17 @@ static public File targetTagFile(String dataId, String group, String tenant, Str
 
     static public String getConfig(String dataId, String group, String tenant)
         throws IOException {
-        FileInputStream fis = null;
         File file = targetFile(dataId, group, tenant);
         if (file.exists()) {
+            FileInputStream fis = null;
             try {
                 fis = new FileInputStream(file);
+                return IOUtils.toString(fis, Constants.ENCODE);
             } catch (FileNotFoundException e) {
                 return StringUtils.EMPTY;
+            } finally {
+                IOUtils.closeQuietly(fis);
             }
-            String content = IOUtils.toString(fis, Constants.ENCODE);
-            return content;
         } else {
             return StringUtils.EMPTY;
         }