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/12/15 11:17:15 UTC
tomee git commit: whitelist logic issue on openejb-client impl (ok on
server one)
Repository: tomee
Updated Branches:
refs/heads/master 15c64360f -> 31c5927e8
whitelist logic issue on openejb-client impl (ok on server one)
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/31c5927e
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/31c5927e
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/31c5927e
Branch: refs/heads/master
Commit: 31c5927e8db12bd47e6b6b0f44388c3edbbde070
Parents: 15c6436
Author: Romain Manni-Bucau <rm...@gmail.com>
Authored: Tue Dec 15 11:17:23 2015 +0100
Committer: Romain Manni-Bucau <rm...@gmail.com>
Committed: Tue Dec 15 11:17:23 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/31c5927e/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 1a0abe7..9ce9291 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) {