@@ -409,19 +409,41 @@ public class ResolverUtil<T> {
log.trace("Extracted JAR URL: ", jarUrl);
}
else {
+ log.trace("Not a JAR: ", jarUrl);
return null;
}
// Try to open and test it
try {
URL testUrl = new URL(jarUrl.toString());
- if (isJar(testUrl))
+ if (isJar(testUrl)) {
return testUrl;
+ }
+ else {
+ // WebLogic fix: check if the URL's file exists in the filesystem.
+ log.trace("Not a JAR: ", jarUrl);
+ jarUrl.replace(0, jarUrl.length(), testUrl.getFile());
+ File file = new File(jarUrl.toString());
+
+ // File name might be URL-encoded
+ if (!file.exists()) {
+ file = new File(StringUtil.urlDecode(jarUrl.toString()));
+ }
+
+ if (file.exists()) {
+ log.trace("Trying real file: ", file.getAbsolutePath());
+ testUrl = file.toURI().toURL();
+ if (isJar(testUrl)) {
+ return testUrl;
+ }
+ }
+ }
}
catch (MalformedURLException e) {
log.warn("Invalid JAR URL: ", jarUrl);
}
+ log.trace("Not a JAR: ", jarUrl);
return null;
}
stripes/src/net/sourceforge/stripes/util/ResolverUtil.java
adc5717290d81883e82b68229a52c3b63da60498
bengunter
bengunter@d471f07e-d8fc-0310-a67b-dd4c8ff0e7cd
http://github.com/juretta/stripes/commit/3a407aac5a3675ce91618ffec42234fafe53613a
3a407aac5a3675ce91618ffec42234fafe53613a
2009-11-10T06:16:48-08:00
2009-11-10T06:16:48-08:00
Applied fix for STS-723 from 1.5.x branch.
git-svn-id: https://stripes.svn.sourceforge.net/svnroot/stripes/trunk@1217 d471f07e-d8fc-0310-a67b-dd4c8ff0e7cd
4753ccd30f6d774f4bbd8399a8f82e2aacec3300
bengunter
bengunter@d471f07e-d8fc-0310-a67b-dd4c8ff0e7cd