[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openejb-cvs
Subject:    tomee git commit: resource should be used if found
From:       rmannibucau () apache ! org
Date:       2014-12-30 17:52:59
Message-ID: fd5d927a9ab44bde860745ec225a9389 () git ! apache ! org
[Download RAW message or body]

Repository: tomee
Updated Branches:
  refs/heads/develop a9b090b81 -> 4d2446e72


resource should be used if found


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4d2446e7
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4d2446e7
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4d2446e7

Branch: refs/heads/develop
Commit: 4d2446e726d39618e712701907c1d85889f40a58
Parents: a9b090b
Author: Romain Manni-Bucau <rmannibucau@apache.org>
Authored: Tue Dec 30 18:52:38 2014 +0100
Committer: Romain Manni-Bucau <rmannibucau@apache.org>
Committed: Tue Dec 30 18:52:38 2014 +0100

----------------------------------------------------------------------
 .../java/org/apache/openejb/testing/ApplicationComposers.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/4d2446e7/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
                
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java \
b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
 index 77c727b..51766a3 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
                
+++ b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
 @@ -1149,7 +1149,7 @@ public final class ApplicationComposers {
                 for (final Descriptor descriptor : ((Descriptors) \
descriptors).value()) {  URL resource = loader.getResource(descriptor.path());
                     try {
-                        dds.put(descriptor.name(), resource == null ? new \
File(descriptor.path()).toURI().toURL() : null); +                        \
dds.put(descriptor.name(), resource == null ? new \
File(descriptor.path()).toURI().toURL() : resource);  } catch (final \
MalformedURLException e) {  throw new IllegalArgumentException(e);
                     }
@@ -1159,7 +1159,7 @@ public final class ApplicationComposers {
                     for (final org.apache.openejb.junit.Descriptor descriptor : \
                ((org.apache.openejb.junit.Descriptors) descriptors).value()) {
                         URL resource = loader.getResource(descriptor.path());
                         try {
-                            dds.put(descriptor.name(), resource == null ? new \
File(descriptor.path()).toURI().toURL() : null); +                            \
dds.put(descriptor.name(), resource == null ? new \
File(descriptor.path()).toURI().toURL() : resource);  } catch (final \
MalformedURLException e) {  throw new IllegalArgumentException(e);
                         }


[prev in list] [next in list] [prev in thread] [next in thread]