Author: dblevins Date: Thu May 27 20:55:12 2010 New Revision: 948987 URL: http://svn.apache.org/viewvc?rev=948987&view=rev Log: svn merge -r 946862:946863 https://svn.apache.org/repos/asf/openejb/trunk/openejb3
http://svn.apache.org/viewvc?rev=946863&view=rev ------------------------------------------------------------------------ r946863 | djencks | 2010-05-20 21:00:17 -0700 (Thu, 20 May 2010) | 1 line osgi doesn't produce file urls. Fix an annoying exception in osgi environments ------------------------------------------------------------------------ Modified: openejb/branches/openejb-3.1.x/ (props changed) openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed) openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed) Propchange: openejb/branches/openejb-3.1.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 20:55:12 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1:779593 -/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946792,946814,946861 +/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946792,946814,946861,946863 Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java?rev=948987&r1=948986&r2=948987&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java (original) +++ openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java Thu May 27 20:55:12 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); } } Propchange: openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 20:55:12 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593 -/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757,945989,946792,946814,946861 +/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757,945989,946792,946814,946861,946863 Propchange: openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 20:55:12 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593 -/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757,945989,946792,946814,946861 +/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757,945989,946792,946814,946861,946863
