You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2015/10/08 17:01:28 UTC
svn commit: r1707560 - in /qpid/java/trunk/broker-core/src:
main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
test/java/org/apache/qpid/server/model/VirtualHostTest.java
Author: orudyy
Date: Thu Oct 8 15:01:28 2015
New Revision: 1707560
URL: http://svn.apache.org/viewvc?rev=1707560&view=rev
Log:
QPID-6782: [Java Broker] Fix blocking of existing connections in AbstractVirtualHost
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1707560&r1=1707559&r2=1707560&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Thu Oct 8 15:01:28 2015
@@ -1062,7 +1062,7 @@ public abstract class AbstractVirtualHos
synchronized (_connections)
{
_blockingReasons.add(blockingType);
- if(!_blocked.compareAndSet(false,true))
+ if(_blocked.compareAndSet(false,true))
{
for(Connection<?> conn : _connections)
{
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java?rev=1707560&r1=1707559&r2=1707560&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java Thu Oct 8 15:01:28 2015
@@ -56,6 +56,8 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.store.ConfiguredObjectRecord;
import org.apache.qpid.server.store.DurableConfigurationStore;
+import org.apache.qpid.server.store.Event;
+import org.apache.qpid.server.store.EventListener;
import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler;
import org.apache.qpid.server.transport.AMQPConnection;
import org.apache.qpid.server.transport.AbstractAMQPConnection;
@@ -383,6 +385,16 @@ public class VirtualHostTest extends Qpi
verify(_configStore, never()).remove(matchesRecord(virtualHost.getId(), virtualHost.getType()));
}
+ public void testExistingConnectionBlocking()
+ {
+ VirtualHost<?,?,?> host = createVirtualHost(getTestName());
+ AbstractAMQPConnection connection = mock(AbstractAMQPConnection.class);
+ when(connection.getUnderlyingConnection()).thenReturn(connection);
+ host.registerConnection(connection);
+ ((EventListener)host).event(Event.PERSISTENT_MESSAGE_SIZE_OVERFULL);
+ verify(connection).block();
+ }
+
private VirtualHost<?,?,?> createVirtualHost(final String virtualHostName)
{
Map<String, Object> attributes = new HashMap<>();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org