qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject qpid-broker-j git commit: QPID-7694:[Broker-J][AMQP 0-8..0-10] Allow specifying queue wire argument 'qpid.last_value_queue' for backward compatibility
Date Mon, 10 Dec 2018 16:01:47 GMT
Repository: qpid-broker-j
Updated Branches:
  refs/heads/master c862a92b6 -> 99380cf7d


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


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/99380cf7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/99380cf7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/99380cf7

Branch: refs/heads/master
Commit: 99380cf7d0a484b4bbe49cc207cbd1e400dcf1c2
Parents: c862a92
Author: Alex Rudyy <orudyy@apache.org>
Authored: Mon Dec 10 15:59:45 2018 +0000
Committer: Alex Rudyy <orudyy@apache.org>
Committed: Mon Dec 10 15:59:45 2018 +0000

----------------------------------------------------------------------
 .../apache/qpid/server/queue/QueueArgumentsConverter.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/99380cf7/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 @@ public class QueueArgumentsConverter
                     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))
             {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message