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:06:15 UTC
svn commit: r1450171 -
/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:06:14 2013
New Revision: 1450171
URL: http://svn.apache.org/r1450171
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=1450171&r1=1450170&r2=1450171&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:06:14 2013
@@ -73,8 +73,13 @@ public class SWClassLoader extends Class
@Override
protected URL findResource(String name) {
- 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) {
try {
return new URL(null, "archive:" + archive.getName() + "/" + name, new ArchiveStreamHandler());
@@ -114,8 +119,15 @@ public class SWClassLoader extends Class
@Override
public InputStream getInputStream() throws IOException {
final String arName = key(url);
- final String path = prefixes.get(arName) + path(arName, url);
- final Asset asset = archives.get(arName).get(path).getAsset();
+
+ String path = prefixes.get(arName) + path(arName, url);
+ Node node = archives.get(arName).get(path);
+ if (node == null) {
+ path = path(arName, url);
+ node = archives.get(arName).get(path);
+ }
+
+ final Asset asset = node.getAsset();
final InputStream input = asset.openStream();
final Collection<Closeable> c = closeables.get(arName);
c.add(input);