You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2019/06/14 10:17:03 UTC
svn commit: r1861327 -
/webservices/neethi/trunk/src/main/java/org/apache/neethi/util/Service.java
Author: coheigea
Date: Fri Jun 14 10:17:03 2019
New Revision: 1861327
URL: http://svn.apache.org/viewvc?rev=1861327&view=rev
Log:
Making sure an inputstream is closed
Modified:
webservices/neethi/trunk/src/main/java/org/apache/neethi/util/Service.java
Modified: webservices/neethi/trunk/src/main/java/org/apache/neethi/util/Service.java
URL: http://svn.apache.org/viewvc/webservices/neethi/trunk/src/main/java/org/apache/neethi/util/Service.java?rev=1861327&r1=1861326&r2=1861327&view=diff
==============================================================================
--- webservices/neethi/trunk/src/main/java/org/apache/neethi/util/Service.java (original)
+++ webservices/neethi/trunk/src/main/java/org/apache/neethi/util/Service.java Fri Jun 14 10:17:03 2019
@@ -21,10 +21,10 @@ package org.apache.neethi.util;
import java.io.BufferedReader;
import java.io.IOException;
-import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
@@ -45,11 +45,11 @@ public final class Service {
// Remember providers we have looked up before.
static Map<String, List<?>> instanceMap = new HashMap<String, List<?>>();
-
+
private Service() {
//not constructed
}
-
+
@SuppressWarnings("unchecked")
private static <T> List<T> cast(List<?> p) {
return (List<T>)p;
@@ -106,14 +106,9 @@ public final class Service {
}
while (e.hasMoreElements()) {
- InputStream is = null;
- try {
- URL u = e.nextElement();
-
- is = u.openStream();
-
- Reader r = new InputStreamReader(is, "UTF-8");
- BufferedReader br = new BufferedReader(r);
+ URL u = e.nextElement();
+ try (Reader r = new InputStreamReader(u.openStream(), StandardCharsets.UTF_8);
+ BufferedReader br = new BufferedReader(r)) {
String line = br.readLine();
while (line != null) {
@@ -133,7 +128,7 @@ public final class Service {
continue;
}
- // Try and load the class
+ // Try and load the class
Object obj = cl.loadClass(line).newInstance();
// stick it into our vector...
l.add(cls.cast(obj));
@@ -146,17 +141,9 @@ public final class Service {
// Just try the next file...
} catch (LinkageError le) {
// Just try the next file...
- } finally {
- try {
- if (is != null) {
- is.close();
- }
- } catch (IOException ex) {
- //ignore
- }
}
}
return l;
}
-
+
}
\ No newline at end of file