(fix) minor fix

fengjiachun · Jun 25, 2019 · 33ae75e · 33ae75e
1 parent d3134ab
commit 33ae75e
Showing 1 changed file with 7 additions and 19 deletions.
diff --git a/jupiter-common/src/main/java/org/jupiter/common/util/JServiceLoader.java b/jupiter-common/src/main/java/org/jupiter/common/util/JServiceLoader.java
@@ -20,6 +20,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Iterator;
@@ -172,29 +173,16 @@ private int parseLine(Class<?> service, URL u, BufferedReader r, int lc, List<St
         return lc + 1;
     }
 
-    @SuppressWarnings("all")
     private Iterator<String> parse(Class<?> service, URL url) {
-        InputStream in = null;
-        BufferedReader r = null;
-        ArrayList<String> names = Lists.newArrayList();
-        try {
-            in = url.openStream();
-            r = new BufferedReader(new InputStreamReader(in, "utf-8"));
+        ArrayList<String> names = new ArrayList<>();
+        try (InputStream in = url.openStream();
+             BufferedReader r = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8))) {
             int lc = 1;
-            while ((lc = parseLine(service, url, r, lc, names)) >= 0) ;
+            // noinspection StatementWithEmptyBody
+            while ((lc = parseLine(service, url, r, lc, names)) >= 0)
+                ;
         } catch (IOException x) {
             throw fail(service, "error reading configuration file", x);
-        } finally {
-            try {
-                if (r != null) {
-                    r.close();
-                }
-                if (in != null) {
-                    in.close();
-                }
-            } catch (IOException y) {
-                throw fail(service, "error closing configuration file", y);
-            }
         }
         return names.iterator();
     }