Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 2e8efc0a9 -> 2dbad8f73


QPID-7843: Correct queue attribute minimumMessageTtl/maximumMessageTtl 
documentation


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/2dbad8f7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/2dbad8f7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/2dbad8f7

Branch: refs/heads/master
Commit: 2dbad8f739172d55dbc40759a8bdbeade33a44f0
Parents: 2e8efc0
Author: Keith Wall <[email protected]>
Authored: Thu Jun 29 09:28:25 2017 +0100
Committer: Keith Wall <[email protected]>
Committed: Thu Jun 29 09:28:25 2017 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/qpid/server/model/Queue.java   | 7 +++++--
 .../managing/Java-Broker-Management-Managing-Queues.xml     | 9 +++++----
 2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/2dbad8f7/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java 
b/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
index bb8e8cd..148291c 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
@@ -223,11 +223,14 @@ public interface Queue<X extends Queue<X>> extends 
ConfiguredObject<X>,
     MessageDurability getMessageDurability();
 
     @SuppressWarnings("unused")
-    @ManagedAttribute
+    @ManagedAttribute(description = "Minimum message time to live (TTL) in ms. 
Messages arriving with smaller TTL"
+                                    + " values will be overridden by this 
value")
     long getMinimumMessageTtl();
 
     @SuppressWarnings("unused")
-    @ManagedAttribute
+    @ManagedAttribute(description = "Maximum message time to live (TTL) in ms. 
Messages arriving with larger TTL"
+                                    + " values (including those with no TTL, 
which are considered to have a TTL value of"
+                                    + " infinity) will be overridden by this 
value.")
     long getMaximumMessageTtl();
 
     @SuppressWarnings("unused")

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/2dbad8f7/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Queues.xml
----------------------------------------------------------------------
diff --git 
a/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Queues.xml
 
b/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Queues.xml
index ccd349d..5574648 100644
--- 
a/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Queues.xml
+++ 
b/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Queues.xml
@@ -60,10 +60,11 @@
             non durable queue do not survive a restart even if they are marked 
persistent.</para>
         </listitem>
         <listitem>
-          <para><emphasis>Maximum/Minimum TTL</emphasis>. Defines a maximum 
and minimum
-            time-to-live. Messages arriving with ttl larger than the maximum 
will be overridden by
-            the maximum. Similarly, messages arriving with tll less than the 
minimum (or no ttl at
-            all), will be overridden by the minimum.</para>
+            <para><emphasis>Maximum/Minimum TTL</emphasis>. Defines a maximum 
and minimum time-to-live (TTL). Messages
+                arriving with TTL larger than the maximum (including those 
with no TTL at all, which are considered to
+                have a TTL of infinity) will be overridden by the maximum. 
Similarly, messages arriving with TTL less
+                than the minimum, will be overridden by the minimum.
+            </para>
           <para>Changing these values affects only new arrivals, existing 
messages already on the
             queue are not affected.</para>
         </listitem>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to