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/12/04 16:57:44 UTC
tomee git commit: backporting enhancement on
ADDITIONAL_EXCLUDES/ADDITIONAL_INCLUDE and extension filtering
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x b3271346d -> 3a04a5583
backporting enhancement on ADDITIONAL_EXCLUDES/ADDITIONAL_INCLUDE and extension filtering
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/3a04a558
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/3a04a558
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/3a04a558
Branch: refs/heads/tomee-1.7.x
Commit: 3a04a5583e8c072e14559281d41c47366578b825
Parents: b327134
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Thu Dec 4 16:57:35 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Thu Dec 4 16:57:35 2014 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/Extensions.java | 2 +-
.../main/java/org/apache/openejb/config/NewLoaderLogic.java | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a04a558/container/openejb-core/src/main/java/org/apache/openejb/Extensions.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/Extensions.java b/container/openejb-core/src/main/java/org/apache/openejb/Extensions.java
index 520ee13..4e4c541 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/Extensions.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/Extensions.java
@@ -104,7 +104,7 @@ public final class Extensions {
public static class Finder extends ResourceFinder {
public Finder(final String path, final URL... urls) {
- super(path, urls);
+ super(path, urls == null ? new URL[0] : urls);
}
// ensure we support multiple class by file
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a04a558/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java b/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
index 8722f3f..3c33148 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
@@ -274,12 +274,10 @@ public class NewLoaderLogic {
excludes.addAll(Arrays.asList(exclusions));
if (ADDITIONAL_EXCLUDES != null) {
- for (final String exclude : ADDITIONAL_EXCLUDES.split(",")) {
- excludes.add(exclude.trim());
- }
+ Collections.addAll(excludes, ADDITIONAL_EXCLUDES.split("[ \t\r\n]*,[ \t\n\n]*"));
}
if (ADDITIONAL_INCLUDE != null) { // include = not excluded
- for (final String rawInclude : ADDITIONAL_INCLUDE.split(",")) {
+ for (final String rawInclude : ADDITIONAL_INCLUDE.split("[ \t\r\n]*,[ \t\n\n]*")) {
final String include = rawInclude.trim();
final Iterator<String> excluded = excludes.iterator();
while (excluded.hasNext()) {