You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/02/24 18:22:34 UTC
svn commit: r1571359 - in /qpid/trunk/qpid/java:
broker-core/src/main/java/org/apache/qpid/server/virtualhost/
systests/src/main/java/org/apache/qpid/server/logging/ test-profiles/
Author: rgodfrey
Date: Mon Feb 24 17:22:34 2014
New Revision: 1571359
URL: http://svn.apache.org/r1571359
Log:
QPID-5555 : address review comments from Robbie Gemmell
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
qpid/trunk/qpid/java/test-profiles/Java010Excludes
qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1571359&r1=1571358&r2=1571359&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Mon Feb 24 17:22:34 2014
@@ -550,13 +550,6 @@ public abstract class AbstractVirtualHos
attributes = new LinkedHashMap<String, Object>(attributes);
String queueName = MapValueConverter.getStringAttribute(Queue.NAME, attributes);
- boolean autoDelete = MapValueConverter.getEnumAttribute(LifetimePolicy.class,
- Queue.LIFETIME_POLICY,
- attributes,
- LifetimePolicy.PERMANENT) != LifetimePolicy.PERMANENT;
- boolean durable = MapValueConverter.getBooleanAttribute(Queue.DURABLE, attributes, false);
- ExclusivityPolicy exclusive = MapValueConverter.getEnumAttribute(ExclusivityPolicy.class,Queue.EXCLUSIVE, attributes, ExclusivityPolicy.NONE);
- String owner = MapValueConverter.getStringAttribute(Queue.OWNER, attributes, null);
synchronized (_queueRegistry)
{
@@ -567,7 +560,7 @@ public abstract class AbstractVirtualHos
if(!attributes.containsKey(Queue.ID))
{
- UUID id = UUIDGenerator.generateExchangeUUID(queueName, getName());
+ UUID id = UUIDGenerator.generateQueueUUID(queueName, getName());
while(_queueRegistry.getQueue(id) != null)
{
id = UUID.randomUUID();
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java?rev=1571359&r1=1571358&r2=1571359&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java Mon Feb 24 17:22:34 2014
@@ -98,7 +98,11 @@ public class DurableQueueLoggingTest ext
String clientID = _connection.getClientID();
assertNotNull("clientID should not be null", clientID);
- validateQueueProperties(results, false, false, clientID);
+ // in 0-8/9/9-1 an exclusive queue will be deleted when the connection is closed, so auto-delete is true.
+ // in 0-10 an exclusive queue outlasts the creating connection and so is not auto-delete
+ // the queue only has owner as the client-id in 0-8/9/91 where exclusivity is taken to mean exclusive to the
+ // client-id in perpetuity. For 0-10 exclusive means exclusive to a session.
+ validateQueueProperties(results, false, !(isBroker010() || _durable), (_durable && !isBroker010()) ? clientID : null);
}
/**
Modified: qpid/trunk/qpid/java/test-profiles/Java010Excludes
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/Java010Excludes?rev=1571359&r1=1571358&r2=1571359&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/Java010Excludes (original)
+++ qpid/trunk/qpid/java/test-profiles/Java010Excludes Mon Feb 24 17:22:34 2014
@@ -35,9 +35,6 @@ org.apache.qpid.server.logging.ChannelLo
org.apache.qpid.server.logging.ChannelLoggingTest#testChannelStartConsumerFlowStarted
org.apache.qpid.server.logging.ConsumerLoggingTest#testSubscriptionSuspend
org.apache.qpid.server.logging.ChannelLoggingTest#testChannelClosedOnQueueArgumentsMismatch
-// 0-10 exclusive queue is session exclusive and not container exclusive (so exclusive owner is not client-id)
-org.apache.qpid.server.logging.DurableQueueLoggingTest#testQueueCreateDurableExclusive
-org.apache.qpid.server.logging.TransientQueueLoggingTest#testQueueCreateDurableExclusive
// 0-10 is not supported by the MethodRegistry
org.apache.qpid.test.unit.close.JavaServerCloseRaceConditionTest#*
Modified: qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes?rev=1571359&r1=1571358&r2=1571359&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes (original)
+++ qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes Mon Feb 24 17:22:34 2014
@@ -79,7 +79,3 @@ org.apache.qpid.systest.management.jmx.Q
// QPID-3396
org.apache.qpid.test.unit.client.connection.ConnectionTest#testExceptionWhenUserPassIsRequired
-// Non durable exclusive queues are exclusive to a connection (and thus auto-delete - or at least
-// not permanent), also their owner is not the container (client-id) but the connection
-org.apache.qpid.server.logging.TransientQueueLoggingTest#testQueueCreateDurableExclusive
-
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org