Author: dblevins
Date: Wed Apr 21 00:46:09 2010
New Revision: 936129
URL: http://svn.apache.org/viewvc?rev=936129&view=rev
Log:
Reverting unintentional change
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/URLs.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/URLs.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/URLs.java?rev=936129&r1=936128&r2=936129&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/URLs.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/URLs.java
Wed Apr 21 00:46:09 2010
@@ -16,9 +16,11 @@
*/
package org.apache.openejb.util;
+
+import static org.apache.openejb.loader.JarLocation.decode;
+
import java.io.File;
import java.net.MalformedURLException;
-import java.net.URISyntaxException;
import java.net.URL;
/**
@@ -42,11 +44,7 @@ public class URLs {
throw new IllegalStateException(e);
}
} else if ("file".equals(url.getProtocol())) {
- try {
- return new File(url.toURI().getPath());
- } catch (URISyntaxException e) {
- throw new IllegalArgumentException("bad url " +
url.toExternalForm(), e);
- }
+ return new File(decode(url.getFile()));
} else {
throw new IllegalArgumentException("Unsupported URL scheme: " +
url.toExternalForm());
}