diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2015-03-15 15:25:15 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2015-03-15 15:25:15 +0000 |
| commit | fe6bf2f7fb72255666af4dd4f3ea4a29b9bfb7f8 (patch) | |
| tree | c1a99cd929cfa423dc789d9d4b854e47e06b7dd7 /qpid/java/broker-plugins | |
| parent | 970be2db6117c8727e7757e062c9694dda1e4542 (diff) | |
| download | qpid-python-fe6bf2f7fb72255666af4dd4f3ea4a29b9bfb7f8.tar.gz | |
QPID-6452 : Defer creating filters in default filter map until a consumer is added. Optimize filters which start at the tail of the queue.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1666810 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins')
2 files changed, 8 insertions, 2 deletions
diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java index 25ea2430ce..75a67c6c2a 100644 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java @@ -294,7 +294,7 @@ public class ServerSessionDelegate extends SessionDelegate { filterManager = new FilterManager(); } - MessageFilter filter = new ArrivalTimeFilter(startingFrom); + MessageFilter filter = new ArrivalTimeFilter(startingFrom, period == 0); filterManager.add(filter.getName(), filter); } diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java index 99c9f11b33..87becd955d 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java @@ -755,6 +755,12 @@ public class AMQChannel { return message.getConnectionReference() != connectionReference; } + + @Override + public boolean startAtTail() + { + return false; + } }; filterManager.add(filter.getName(), filter); } @@ -788,7 +794,7 @@ public class AMQChannel { filterManager = new FilterManager(); } - MessageFilter filter = new ArrivalTimeFilter(startingFrom); + MessageFilter filter = new ArrivalTimeFilter(startingFrom, period==0); filterManager.add(filter.getName(), filter); } |