QPID-5555 : address review comments from Robbie Gemmell

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

3 files changed, 2 insertions, 16 deletions

diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
index 02494009c1..701fd94115 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
@@ -44,11 +44,9 @@ import java.util.UUID;
 import org.apache.log4j.Logger;
 import org.apache.qpid.server.model.Binding;
 import org.apache.qpid.server.model.Exchange;
-import org.apache.qpid.server.model.ExclusivityPolicy;
 import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.model.UUIDGenerator;
-import org.apache.qpid.server.queue.AMQQueueFactory;
 import org.apache.qpid.server.queue.QueueArgumentsConverter;
 import org.apache.qpid.server.store.berkeleydb.entry.Xid;
 import org.apache.qpid.server.store.berkeleydb.tuple.XidBinding;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
index 4e9d94c030..8f77de56b8 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
@@ -102,7 +102,7 @@ public class QueueConfiguration extends AbstractConfiguration
 
     public boolean getDurable()
     {
-        return getDefaultedBoolean("boolean");
+        return getDefaultedBoolean("durable");
     }
 
     public boolean getExclusive()
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index 1f62525794..352129b514 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -401,19 +401,7 @@ abstract class AbstractQueue<E extends QueueEntryImpl<E,Q,L>,
             setMaximumDeliveryCount(virtualHost.getDefaultMaximumDeliveryAttempts());
         }
 
-        final String ownerString;
-        switch(_exclusivityPolicy)
-        {
-            case PRINCIPAL:
-                ownerString = ((Principal) _exclusiveOwner).getName();
-                break;
-            case CONTAINER:
-                ownerString = (String) _exclusiveOwner;
-                break;
-            default:
-                ownerString = null;
-
-        }
+        final String ownerString = getOwner();
 
         // Log the creation of this Queue.
         // The priorities display is toggled on if we set priorities > 0