svn commit: r321253 - in /struts/core/trunk/src/java/org/apache/struts: action/ActionServlet.java plugins/DigestingPlugIn.java

[mrdon]

Author: mrdon
Date: Fri Oct 14 16:54:16 2005
New Revision: 321253

URL: http://svn.apache.org/viewcvs?rev=321253&view=rev
Log:
Fixing loading from URL's to use URLConnection with caching set to
false; prevents jar locking.  Patch by Filippo Munafo
PR: 37041

Modified:
    struts/core/trunk/src/java/org/apache/struts/action/ActionServlet.java
    struts/core/trunk/src/java/org/apache/struts/plugins/DigestingPlugIn.java

Modified: struts/core/trunk/src/java/org/apache/struts/action/ActionServlet.java
URL: 
http://svn.apache.org/viewcvs/struts/core/trunk/src/java/org/apache/struts/action/ActionServlet.java?rev=321253&r1=321252&r2=321253&view=diff
==============================================================================
--- struts/core/trunk/src/java/org/apache/struts/action/ActionServlet.java 
(original)
+++ struts/core/trunk/src/java/org/apache/struts/action/ActionServlet.java Fri 
Oct 14 16:54:16 2005
@@ -24,6 +24,7 @@
 import java.math.BigInteger;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Enumeration;
@@ -759,7 +760,10 @@
         InputStream input = null;
         try {
             InputSource is = new InputSource(url.toExternalForm());
-            input = url.openStream();
+            URLConnection conn = url.openConnection();
+            conn.setUseCaches(false);
+            conn.connect();
+            input = conn.getInputStream();
             is.setByteStream(input);
             digester.parse(is);
 

Modified: 
struts/core/trunk/src/java/org/apache/struts/plugins/DigestingPlugIn.java
URL: 
http://svn.apache.org/viewcvs/struts/core/trunk/src/java/org/apache/struts/plugins/DigestingPlugIn.java?rev=321253&r1=321252&r2=321253&view=diff
==============================================================================
--- struts/core/trunk/src/java/org/apache/struts/plugins/DigestingPlugIn.java 
(original)
+++ struts/core/trunk/src/java/org/apache/struts/plugins/DigestingPlugIn.java 
Fri Oct 14 16:54:16 2005
@@ -21,6 +21,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.net.URLConnection;
 
 import javax.servlet.ServletException;
 
@@ -130,7 +131,10 @@
                       + this.configPath
                       + ", source: "
                       + this.configSource + "]");
-            obj = digester.parse(configURL.openStream());
+            URLConnection conn = configURL.openConnection();
+            conn.setUseCaches(false);
+            conn.connect();
+            obj = digester.parse(conn.getInputStream());
 
         } catch (IOException e) {
             // TODO Internationalize msg



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]