whitelist logic issue
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f6130e2c Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f6130e2c Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f6130e2c Branch: refs/heads/tomee-1.7.x Commit: f6130e2c19d506defca8a3d963ab32d5fd9e4fda Parents: 6e8147e Author: Romain Manni-Bucau <rmann...@gmail.com> Authored: Tue Dec 15 11:16:44 2015 +0100 Committer: Romain Manni-Bucau <rmann...@gmail.com> Committed: Tue Dec 15 11:16:44 2015 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/openejb/client/EjbObjectInputStream.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/f6130e2c/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java ---------------------------------------------------------------------- diff --git a/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java b/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java index c1e9eda..50df6ff 100644 --- a/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java +++ b/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java @@ -106,7 +106,7 @@ public class EjbObjectInputStream extends ObjectInputStream { } 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) {
