diff options
Diffstat (limited to 'java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java')
| -rw-r--r-- | java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java b/java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java index a379f85bbb..b9e0e5920f 100644 --- a/java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java +++ b/java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java @@ -27,6 +27,7 @@ import java.util.Map; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.qpid.server.exchange.Exchange; +import org.apache.qpid.server.model.LifetimePolicy; import org.apache.qpid.server.queue.AMQQueue; /** @@ -139,8 +140,8 @@ public class ObjectProperties { setName(queue.getName()); - put(Property.AUTO_DELETE, queue.isAutoDelete()); - put(Property.TEMPORARY, queue.isAutoDelete()); + put(Property.AUTO_DELETE, queue.getLifetimePolicy() != LifetimePolicy.PERMANENT); + put(Property.TEMPORARY, queue.getLifetimePolicy() != LifetimePolicy.PERMANENT); put(Property.DURABLE, queue.isDurable()); put(Property.EXCLUSIVE, queue.isExclusive()); if (queue.getAlternateExchange() != null) @@ -151,10 +152,7 @@ public class ObjectProperties { put(Property.OWNER, queue.getOwner()); } - else if (queue.getAuthorizationHolder() != null) - { - put(Property.OWNER, queue.getAuthorizationHolder().getAuthorizedPrincipal().getName()); - } + } public ObjectProperties(Exchange exch, AMQQueue queue, String routingKey) |