commit 99380cf7d0a484b4bbe49cc207cbd1e400dcf1c2
author Alex Rudyy <orudyy@apache.org> Mon Dec 10 15:59:45 2018 +0000
committer Alex Rudyy <orudyy@apache.org> Mon Dec 10 15:59:45 2018 +0000
tree 0ef4f66bd0b7f326b614c58690a389d95465213e
parent c862a92b650fbb9bcc5665fdc03e652f3c54fc0c

QPID-7694:[Broker-J][AMQP 0-8..0-10] Allow specifying queue wire argument 'qpid.last_value_queue' for backward compatibility

broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java

diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java b/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java
index 0c01d52..05330eb 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java
@@ -169,9 +169,13 @@
                     wireArgumentNames.remove(entry.getKey());
                 }
             }
-            if(wireArguments.containsKey(QPID_LAST_VALUE_QUEUE) && !wireArguments.containsKey(QPID_LAST_VALUE_QUEUE_KEY))
+            if(wireArguments.containsKey(QPID_LAST_VALUE_QUEUE))
             {
-                modelArguments.put(LastValueQueue.LVQ_KEY, LastValueQueue.DEFAULT_LVQ_KEY);
+                wireArgumentNames.remove(QPID_LAST_VALUE_QUEUE);
+                if (!wireArguments.containsKey(QPID_LAST_VALUE_QUEUE_KEY))
+                {
+                    modelArguments.put(LastValueQueue.LVQ_KEY, LastValueQueue.DEFAULT_LVQ_KEY);
+                }
             }
             if(wireArguments.containsKey(QPID_POLICY_TYPE))
             {