You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2013/02/26 15:07:33 UTC
svn commit: r1450174 -
/tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java
Author: rmannibucau
Date: Tue Feb 26 14:07:33 2013
New Revision: 1450174
URL: http://svn.apache.org/r1450174
Log:
OPENEJB-2002 look for resources in / too
Modified:
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java
Modified: tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java?rev=1450174&r1=1450173&r2=1450174&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java Tue Feb 26 14:07:33 2013
@@ -63,8 +63,13 @@ public class SWClassLoader extends Class
@Override
protected Enumeration<URL> findResources(final String name) throws IOException {
- final ArchivePath path = ArchivePaths.create(prefix + name);
- final Node node = archive.get(path);
+ ArchivePath path = ArchivePaths.create(prefix + name);
+ Node node = archive.get(path);
+ if (node == null) {
+ path = ArchivePaths.create(name);
+ node = archive.get(path);
+ }
+
if (node != null) {
return new Enumerator(Arrays.asList(new URL(null, "archive:" + archive.getName() + "/" + name, new ArchiveStreamHandler())));
}
@@ -72,7 +77,7 @@ public class SWClassLoader extends Class
}
@Override
- protected URL findResource(String name) {
+ protected URL findResource(final String name) {
ArchivePath path = ArchivePaths.create(prefix + name);
Node node = archive.get(path);
if (node == null) {