You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/05/25 14:04:11 UTC

[1/2] qpid-broker-j git commit: QPID-8199: [Broker-J] Fix unbind/bind operation descriptions

Repository: qpid-broker-j
Updated Branches:
  refs/heads/7.0.x 63f7b7e94 -> 21aabcd9c


QPID-8199: [Broker-J] Fix unbind/bind operation descriptions

(cherry picked from commit 5ccf63f06f218c11af549823ff6ca25585c5fad5)


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

Branch: refs/heads/7.0.x
Commit: 43aa29ec193f1b6748fe72417e8f27c50d0a59ac
Parents: 63f7b7e
Author: Alex Rudyy <or...@apache.org>
Authored: Tue May 22 22:36:07 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Fri May 25 14:54:10 2018 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/qpid/server/model/Exchange.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/43aa29ec/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java b/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
index f954395..122c4fb 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
@@ -100,14 +100,16 @@ public interface Exchange<X extends Exchange<X>> extends ConfiguredObject<X>, Me
     long getMessagesIn();
 
 
-    @ManagedOperation(changesConfiguredObjectState = true)
+    @ManagedOperation(changesConfiguredObjectState = true,
+                      description = "Bind a given destination to exchange using a given bindingKey and arguments."
+                                    + " Existing binding arguments are replaced when replaceExistingArguments=true")
     boolean bind(@Param(name = "destination", mandatory = true) String destination,
                  @Param(name = "bindingKey") String bindingKey,
                  @Param(name = "arguments", defaultValue = "{}") Map<String, Object> arguments,
                  @Param(name = "replaceExistingArguments", defaultValue = "false") boolean replaceExistingArguments);
 
     @ManagedOperation(changesConfiguredObjectState = true,
-                      description = "Deletes all the bindings matching the given destination and bindingKey")
+                      description = "Deletes the binding for a given destination with a given bindingKey")
     boolean unbind(@Param(name="destination", mandatory = true) String destination,
                    @Param(name="bindingKey") String bindingKey);
 


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


[2/2] qpid-broker-j git commit: QPID-8198: [Broker-J[Documentation] Account headers in formula for estimation of heap size

Posted by or...@apache.org.
QPID-8198: [Broker-J[Documentation] Account headers in formula for estimation of heap size

(cherry picked from commit db971ea2ba02f9f5128daac0ab310dad5c8f8fba)


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

Branch: refs/heads/7.0.x
Commit: 21aabcd9c67dbbecda6856eea135e62ce041a59c
Parents: 43aa29e
Author: Alex Rudyy <or...@apache.org>
Authored: Fri May 25 14:46:08 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Fri May 25 14:57:35 2018 +0100

----------------------------------------------------------------------
 doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Memory.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/21aabcd9/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Memory.xml
----------------------------------------------------------------------
diff --git a/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Memory.xml b/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Memory.xml
index 3462910..91d8f9a 100644
--- a/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Memory.xml
+++ b/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Memory.xml
@@ -227,7 +227,7 @@
       <para>
         <informalequation>
           <mathphrase>
-            memory<subscript>heap</subscript> = 15 MB + 20 kB * N<subscript>sessions</subscript> + 1.5 kB * N<subscript>messages</subscript> + 100 kB * N<subscript>connections</subscript>
+            memory<subscript>heap</subscript> = 15 MB + 20 kB * N<subscript>sessions</subscript> + (1.7 kB + (120 + averageSize<subscript>headerNameAndValue</subscript> ) * averageNumber<subscript>headers</subscript>)* N<subscript>messages</subscript> + 100 kB * N<subscript>connections</subscript>
           </mathphrase>
         </informalequation>
       </para>


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