diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-12-17 00:22:01 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-12-17 00:22:01 +0000 |
| commit | 87b282857f59a43fa77ab65a06ea55cd14de0e05 (patch) | |
| tree | 75047e6d62f9050875e1f67e9ec5df7b05560831 /qpid/java | |
| parent | f62711351f225b7ac77cebe5066fa0a69cdbdf00 (diff) | |
| download | qpid-python-87b282857f59a43fa77ab65a06ea55cd14de0e05.tar.gz | |
QPID-6272 : [Java Broker] clear queue delete task on default queue before closing session
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1646118 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java | 10 |
1 files changed, 5 insertions, 5 deletions
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 5461b47eb4..d52fb735a2 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 @@ -142,7 +142,7 @@ public class AMQChannel private long _deliveryTag = 0; /** A channel has a default queue (the last declared) that is used when no queue name is explicitly set */ - private volatile AMQQueue _defaultQueue; + private volatile AMQQueue<?> _defaultQueue; /** This tag is unique per subscription to a queue. The server returns this in response to a basic.consume request. */ private int _consumerTag; @@ -827,7 +827,7 @@ public class AMQChannel getVirtualHost().getEventLogger().message(_logSubject, operationalLogMessage); unsubscribeAllConsumers(); - + setDefaultQueue(null); for (Action<? super AMQChannel> task : _taskList) { task.performAction(this); @@ -3114,7 +3114,7 @@ public class AMQChannel queueName = queueStr.intern(); } - AMQQueue queue; + AMQQueue<?> queue; //TODO: do we need to check that the queue already exists with exactly the same "configuration"? @@ -3574,9 +3574,9 @@ public class AMQChannel return exchangeName == null || AMQShortString.EMPTY_STRING.equals(exchangeName); } - private void setDefaultQueue(AMQQueue queue) + private void setDefaultQueue(AMQQueue<?> queue) { - AMQQueue currentDefaultQueue = _defaultQueue; + AMQQueue<?> currentDefaultQueue = _defaultQueue; if (queue != currentDefaultQueue) { if (currentDefaultQueue != null) |