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 2014/10/21 19:58:44 UTC
git commit: virtualClasspath can be empty
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 400c886a6 -> 991213375
virtualClasspath can be empty
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/99121337
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/99121337
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/99121337
Branch: refs/heads/tomee-1.7.x
Commit: 991213375aafa9274a437c928bb8ad7d41c76ebc
Parents: 400c886
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Tue Oct 21 19:57:49 2014 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Tue Oct 21 19:57:49 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/tomee/catalina/TomcatWebAppBuilder.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/99121337/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
index 9c7fd00..b9e13cc 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
@@ -2147,7 +2147,10 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare
final Object virtualClasspath = Reflections.get(loader, "virtualClasspath");
if (virtualClasspath != null) {
for (final String str : virtualClasspath.toString().split(";")) {
- cp.add(ProvisioningUtil.realLocation(str));
+ final String realLocation = ProvisioningUtil.realLocation(str);
+ if (realLocation != null && !realLocation.isEmpty()) {
+ cp.add(realLocation);
+ }
}
}
}