tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject tomee git commit: supporting comments in additionalLibs
Date Tue, 13 Jan 2015 09:13:21 GMT
Repository: tomee
Updated Branches:
  refs/heads/develop 8b82b6469 -> f110b276f


supporting comments in additionalLibs


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

Branch: refs/heads/develop
Commit: f110b276f97bb469855fb480f73c922c4433db7b
Parents: 8b82b64
Author: Romain Manni-Bucau <rmannibucau@apache.org>
Authored: Tue Jan 13 10:12:57 2015 +0100
Committer: Romain Manni-Bucau <rmannibucau@apache.org>
Committed: Tue Jan 13 10:12:57 2015 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/openejb/arquillian/common/Setup.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/f110b276/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
index f73300d..e57fc70 100644
--- a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
+++ b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
@@ -376,7 +376,11 @@ public class Setup {
 
         final File libFolder = new File(tomeeHome, "lib");
         for (final String lib : libs.split("\n")) {
-            final Set<String> locations = ProvisioningUtil.realLocation(lib.trim());
+            final String trim = lib.trim();
+            if (trim.isEmpty() || trim.startsWith("#")) {
+                continue;
+            }
+            final Set<String> locations = ProvisioningUtil.realLocation(trim);
             for (final String location : locations) {
                 final File from = new File(location);
                 try {


Mime
View raw message