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 2015/03/01 18:58:32 UTC
tomee git commit: avoiding NPE
Repository: tomee
Updated Branches:
refs/heads/develop 936430684 -> 68f2e4b5a
avoiding NPE
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/68f2e4b5
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/68f2e4b5
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/68f2e4b5
Branch: refs/heads/develop
Commit: 68f2e4b5ae4856f862ba828ac44d73e74c0d6601
Parents: 9364306
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sun Mar 1 18:58:15 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Sun Mar 1 18:58:15 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/openejb/util/ContainerClassesFilter.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/68f2e4b5/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java b/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java
index 94d61cd..a95a700 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java
@@ -34,8 +34,8 @@ public class ContainerClassesFilter implements Filter {
private final Filter delegateSkip;
public ContainerClassesFilter(final Properties configuration) {
- final String forcedStr = configuration.getProperty("openejb.container.additional.exclude", null);
- final String skippedStr = configuration.getProperty("openejb.container.additional.include", null);
+ final String forcedStr = configuration == null ? null : configuration.getProperty("openejb.container.additional.exclude", null);
+ final String skippedStr = configuration == null ? null : configuration.getProperty("openejb.container.additional.include", null);
forced = forcedStr == null ? EMPTY_ARRAY : forcedStr.split(" *, *");
skipped = skippedStr == null ? EMPTY_ARRAY : skippedStr.split(" *, *");