svn commit: r908091 - /openejb/branches/openejb-3.0.x/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java

[kevan]

Author: kevan
Date: Tue Feb  9 16:03:18 2010
New Revision: 908091

URL: http://svn.apache.org/viewvc?rev=908091&view=rev
Log:
OPENEJB-1131 merge revision 900008 from Jonathan into branches/3.0.x

Modified:
    
openejb/branches/openejb-3.0.x/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java

Modified: 
openejb/branches/openejb-3.0.x/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
URL: 
http://svn.apache.org/viewvc/openejb/branches/openejb-3.0.x/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java?rev=908091&r1=908090&r2=908091&view=diff
==============================================================================
--- 
openejb/branches/openejb-3.0.x/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
 (original)
+++ 
openejb/branches/openejb-3.0.x/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
 Tue Feb  9 16:03:18 2010
@@ -170,8 +170,16 @@
 
             List<URL> urls = new ArrayList<URL>();
             for (Object item : fileCache.keySet()) {
-                URL url = (URL) item;
-                if (isParent(jarLocation, URLs.toFile(url))) {
+                URL url = null;
+                if (item instanceof URL) {
+                    url = (URL) item;
+                } else if (item instanceof String) {
+                    url = new URL((String) item);
+                } else {
+                    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))) {
                     urls.add(url);
                 }
             }