diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-01-23 17:53:42 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-01-23 17:53:42 +0000 |
| commit | 027c4c9398c0c15ed285d8a99df22d98e469cb0f (patch) | |
| tree | d1e1d1e7b60f96c1c9c8ac0c0d2c4cd500d2eb0f /qpid/java/broker-plugins/amqp-1-0-protocol/src | |
| parent | 1dae32d6fd23383f759650607a7cc38e85ac3f79 (diff) | |
| download | qpid-python-027c4c9398c0c15ed285d8a99df22d98e469cb0f.tar.gz | |
QPID-5504 : simplify QueueEntry to remove discard/dispose/dequeue and only leave delete as the correct way to remove entries
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1560770 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/amqp-1-0-protocol/src')
2 files changed, 6 insertions, 8 deletions
diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java index 034927c56b..4abf1bf76b 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java @@ -631,7 +631,7 @@ public class SendingLink_1_0 implements SendingLinkListener, Link_1_0, DeliveryS { public void postCommit() { - queueEntry.discard(); + queueEntry.delete(); } public void onRollback() diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Subscription_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Subscription_1_0.java index e5f3a52e3b..6a3f5b46e1 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Subscription_1_0.java +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Subscription_1_0.java @@ -148,14 +148,12 @@ class public boolean hasInterest(final QueueEntry entry) { - if(entry.getMessage() instanceof Message_1_0) + if(_noLocal && entry.getMessage().getConnectionReference() == getSession().getConnection().getReference()) { - if(_noLocal && ((Message_1_0)entry.getMessage()).getConnectionReference() == getSession().getConnection().getReference()) - { - return false; - } + return false; } - else if(MessageConverterRegistry.getConverter(entry.getMessage().getClass(), Message_1_0.class)==null) + else if(!(entry.getMessage() instanceof Message_1_0) + && MessageConverterRegistry.getConverter(entry.getMessage().getClass(), Message_1_0.class)==null) { return false; } @@ -537,7 +535,7 @@ class { if(_queueEntry.isAcquiredBy(Subscription_1_0.this)) { - _queueEntry.discard(); + _queueEntry.delete(); } } |