Author: mikedd
Date: Wed Feb 20 07:02:30 2008
New Revision: 629492
URL: http://svn.apache.org/viewvc?rev=629492&view=rev
Log:
OPENJPA-518 Committing code changes suggested by Adam Toback
Modified:
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Services.java
Modified:
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Services.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Services.java?rev=629492&r1=629491&r2=629492&view=diff
==============================================================================
---
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Services.java
(original)
+++
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Services.java
Wed Feb 20 07:02:30 2008
@@ -23,6 +23,7 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
+import java.net.URLConnection;
import java.security.AccessController;
import java.util.ArrayList;
import java.util.Arrays;
@@ -111,11 +112,16 @@
* ignored.
*/
private static void addResources(URL url, Set set) throws IOException {
- InputStream in = url.openConnection().getInputStream();
+ InputStream in = null;
+ BufferedReader reader = null;
+ URLConnection urlCon = null;
try {
- BufferedReader reader = new BufferedReader(new InputStreamReader(
- in));
+ urlCon = url.openConnection();
+ urlCon.setUseCaches(false);
+ in = urlCon.getInputStream();
+ reader = new BufferedReader(new InputStreamReader(in));
+
String line;
while ((line = reader.readLine()) != null) {
if (line.trim().startsWith("#")
@@ -133,6 +139,11 @@
}
}
} finally {
+ try {
+ reader.close();
+ } catch (IOException ioe) {
+ // silently consume exception
+ }
try {
in.close();
} catch (IOException ioe) {
