You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2008/08/14 10:53:32 UTC
svn commit: r685821 - in /tuscany/branches/sca-java-1.3.1/modules:
extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java
Author: slaws
Date: Thu Aug 14 01:53:30 2008
New Revision: 685821
URL: http://svn.apache.org/viewvc?rev=685821&view=rev
Log:
TUSCANY-2539 Change extensibility module to use a URL connection and turn caching off by default so that jar file handle is not held open.
Modified:
tuscany/branches/sca-java-1.3.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
tuscany/branches/sca-java-1.3.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java
Modified: tuscany/branches/sca-java-1.3.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java?rev=685821&r1=685820&r2=685821&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java (original)
+++ tuscany/branches/sca-java-1.3.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java Thu Aug 14 01:53:30 2008
@@ -24,6 +24,7 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
+import java.net.URLConnection;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
@@ -263,6 +264,13 @@
try {
is = AccessController.doPrivileged(new PrivilegedExceptionAction<InputStream>() {
public InputStream run() throws IOException {
+ URLConnection connection = url.openConnection();
+ // TUSCANY-2539
+ // Don't cache connections by default to stop Tuscany locking contribution jar files
+ // done here as this is one of the first places we open a stream and the only way to
+ // set the default is to set it on an instance of URLConnection
+ connection.setDefaultUseCaches(false);
+ connection.setUseCaches(false);
return url.openStream();
}
});
Modified: tuscany/branches/sca-java-1.3.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java?rev=685821&r1=685820&r2=685821&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java (original)
+++ tuscany/branches/sca-java-1.3.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java Thu Aug 14 01:53:30 2008
@@ -24,6 +24,7 @@
import java.io.InputStreamReader;
import java.io.Reader;
import java.net.URL;
+import java.net.URLConnection;
/**
* TODO: Shouldn't this be using the contribution service?
@@ -36,7 +37,9 @@
InputStream is;
try {
- is = scriptSrcUrl.openStream();
+ URLConnection connection = scriptSrcUrl.openConnection();
+ connection.setUseCaches(false);
+ is = connection.getInputStream();
} catch (IOException e) {
throw new RuntimeException(e);
}