You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ma...@apache.org on 2014/09/11 16:24:47 UTC
svn commit: r1624298 -
/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
Author: macbean
Date: Thu Sep 11 14:24:46 2014
New Revision: 1624298
URL: http://svn.apache.org/r1624298
Log:
QPID-6090: [Java Broker] Change based on code review to protect against intruder case
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java?rev=1624298&r1=1624297&r2=1624298&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java Thu Sep 11 14:24:46 2014
@@ -769,7 +769,7 @@ public class BDBHAVirtualHostNodeImpl ex
}
String missingNodeAddress = null;
- if (!proposedPermittedNodes.contains(getAddress()))
+ if (getPermittedNodes().contains(getAddress()) && !proposedPermittedNodes.contains(getAddress()))
{
missingNodeAddress = getAddress();
}
@@ -779,7 +779,7 @@ public class BDBHAVirtualHostNodeImpl ex
{
final BDBHARemoteReplicationNode<?> bdbHaRemoteReplicationNode = (BDBHARemoteReplicationNode<?>) node;
final String remoteNodeAddress = bdbHaRemoteReplicationNode.getAddress();
- if (!proposedPermittedNodes.contains(remoteNodeAddress))
+ if (getPermittedNodes().contains(remoteNodeAddress) && !proposedPermittedNodes.contains(remoteNodeAddress))
{
missingNodeAddress = remoteNodeAddress;
break;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org