svn commit: r965185 - in /wicket/trunk: wicket-util/src/main/java/org/apache/wicket/util/io/Connections.java wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java

[mgrigorov]

Author: mgrigorov
Date: Sun Jul 18 09:34:40 2010
New Revision: 965185

URL: http://svn.apache.org/viewvc?rev=965185&view=rev
Log:
Port from wicket-1.4.x

r890446
Author: jcompagner
Date:   Mon Dec 14 19:12:44 2009 UTC (7 months ago)
Changed paths:  2
Log Message:    
partly reverted 2534 , fixed 2613
Issue: WICKET-2613


Modified:
    
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/Connections.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java

Modified: 
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/Connections.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/Connections.java?rev=965185&r1=965184&r2=965185&view=diff
==============================================================================
--- 
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/Connections.java
 (original)
+++ 
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/Connections.java
 Sun Jul 18 09:34:40 2010
@@ -77,46 +77,6 @@ public class Connections
        }
 
        /**
-        * Tries to find a file on the harddisk that the url points to
-        * 
-        * @param url
-        * @return file file pointing to the connection
-        * @throws Exception
-        *             if file could not be located
-        */
-       public static File findFile(final URL url) throws Exception
-       {
-               File file = null;
-               URL fileUrl = url;
-               URLConnection connection = null;
-
-               try
-               {
-                       connection = url.openConnection();
-
-                       // if this is a connection to a file inside a jar we 
point the file to the jar
-                       // itself
-                       if (connection instanceof JarURLConnection)
-                       {
-                               fileUrl = 
((JarURLConnection)connection).getJarFileURL();
-                       }
-
-                       file = new File(new URI(fileUrl.toExternalForm()));
-
-                       if (file != null && !file.exists())
-                       {
-                               file = null;
-                       }
-
-                       return file;
-               }
-               finally
-               {
-                       close(connection);
-               }
-       }
-
-       /**
         * Closes a connection, ignoring any exceptions if they occur
         * 
         * @param connection

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java?rev=965185&r1=965184&r2=965185&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java
 Sun Jul 18 09:34:40 2010
@@ -19,6 +19,7 @@ package org.apache.wicket.util.resource;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
 
@@ -95,7 +96,12 @@ public class UrlResourceStream extends A
 
                try
                {
-                       file = Connections.findFile(url);
+                       file = new File(new URI(url.toExternalForm()));
+
+                       if (file != null && !file.exists())
+                       {
+                               file = null;
+                       }
                }
                catch (Exception e)
                {