Author: djencks
Date: Fri May 21 04:00:17 2010
New Revision: 946863
URL: http://svn.apache.org/viewvc?rev=946863&view=rev
Log:
osgi doesn't produce file urls. Fix an annoying exception in osgi environments
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java?rev=946863&r1=946862&r2=946863&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
Fri May 21 04:00:17 2010
@@ -180,7 +180,14 @@ public class ClassLoaderUtil {
logger.warning("Don't know how to handle object: " +
item.toString() + " of type: " + item.getClass().getCanonicalName() + " in Sun
JarFileFactory cache, skipping");
}
- if (url != null && isParent(jarLocation, URLs.toFile(url))) {
+ File file = null;
+ try {
+ file = URLs.toFile(url);
+ } catch (IllegalArgumentException e) {
+ //unknown kind of url
+ return;
+ }
+ if (url != null && isParent(jarLocation, file)) {
urls.add(url);
}
}