forgot to push fix for whitelist handling
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1ed1c43f Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1ed1c43f Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1ed1c43f Branch: refs/heads/tomee-7.0.0-M1 Commit: 1ed1c43f141cb32dbda45dcf3ba600cac6253b0a Parents: d199ec4 Author: Romain Manni-Bucau <[email protected]> Authored: Fri Nov 27 15:20:41 2015 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Fri Nov 27 15:20:41 2015 +0100 ---------------------------------------------------------------------- .../org/apache/openejb/core/rmi/BlacklistClassResolver.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/1ed1c43f/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java b/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java index 57b6da6..4ca5299 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java @@ -18,7 +18,9 @@ package org.apache.openejb.core.rmi; public class BlacklistClassResolver { public static final BlacklistClassResolver DEFAULT = new BlacklistClassResolver( - toArray(System.getProperty("tomee.serialization.class.blacklist", "org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan")), + toArray(System.getProperty( + "tomee.serialization.class.blacklist", + "org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan")), toArray(System.getProperty("tomee.serialization.class.whitelist"))); private final String[] blacklist; @@ -30,7 +32,7 @@ public class BlacklistClassResolver { } protected boolean isBlacklisted(final String name) { - return !contains(whitelist, name) && contains(blacklist, name); + return (whitelist != null && !contains(whitelist, name)) || contains(blacklist, name); } public final String check(final String name) {
