QPID-6090: [Java Broker] Change based on code review to protect against intruder case

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1624298 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 2 deletions

diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
index 2eadd63268..604a79f4e3 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
@@ -769,7 +769,7 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtu
         }
 
         String missingNodeAddress = null;
-        if (!proposedPermittedNodes.contains(getAddress()))
+        if (getPermittedNodes().contains(getAddress()) && !proposedPermittedNodes.contains(getAddress()))
         {
             missingNodeAddress = getAddress();
         }
@@ -779,7 +779,7 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtu
             {
                 final BDBHARemoteReplicationNode<?> bdbHaRemoteReplicationNode = (BDBHARemoteReplicationNode<?>) node;
                 final String remoteNodeAddress = bdbHaRemoteReplicationNode.getAddress();
-                if (!proposedPermittedNodes.contains(remoteNodeAddress))
+                if (getPermittedNodes().contains(remoteNodeAddress) && !proposedPermittedNodes.contains(remoteNodeAddress))
                 {
                     missingNodeAddress = remoteNodeAddress;
                     break;