activemq-artemis git commit: ARTEMIS-1902 decrement before returning

2018-06-04 Thread clebertsuconic
Repository: activemq-artemis
Updated Branches:
  refs/heads/2.6.x 950bd7d46 -> db973cc26


ARTEMIS-1902 decrement before returning

(cherry picked from commit be36d3078ceafe3df06a1686426f5d948dfadc2c)


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/db973cc2
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/db973cc2
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/db973cc2

Branch: refs/heads/2.6.x
Commit: db973cc2616749310be3dc21211d438b927e96fe
Parents: 950bd7d
Author: Justin Bertram 
Authored: Mon Jun 4 15:01:04 2018 -0500
Committer: Clebert Suconic 
Committed: Mon Jun 4 16:26:00 2018 -0400

--
 .../org/apache/activemq/artemis/core/postoffice/QueueInfo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/db973cc2/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/QueueInfo.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/QueueInfo.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/QueueInfo.java
index 581d648..f271ebe 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/QueueInfo.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/QueueInfo.java
@@ -114,7 +114,7 @@ public class QueueInfo implements Serializable {
 
   consumerUpdater.getAndUpdate(this, value -> {
  if (value > 0) {
-return value--;
+return --value;
  } else {
 ActiveMQServerLogger.LOGGER.consumerCountError("Tried to decrement 
consumer count below 0: " + this);
 return value;



[1/2] activemq-artemis git commit: ARTEMIS-1902 decrement before returning

2018-06-04 Thread clebertsuconic
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 655f1dc46 -> 46a41aeca


ARTEMIS-1902 decrement before returning


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/be36d307
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/be36d307
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/be36d307

Branch: refs/heads/master
Commit: be36d3078ceafe3df06a1686426f5d948dfadc2c
Parents: 655f1dc
Author: Justin Bertram 
Authored: Mon Jun 4 15:01:04 2018 -0500
Committer: Justin Bertram 
Committed: Mon Jun 4 15:01:04 2018 -0500

--
 .../org/apache/activemq/artemis/core/postoffice/QueueInfo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/be36d307/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/QueueInfo.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/QueueInfo.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/QueueInfo.java
index 581d648..f271ebe 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/QueueInfo.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/QueueInfo.java
@@ -114,7 +114,7 @@ public class QueueInfo implements Serializable {
 
   consumerUpdater.getAndUpdate(this, value -> {
  if (value > 0) {
-return value--;
+return --value;
  } else {
 ActiveMQServerLogger.LOGGER.consumerCountError("Tried to decrement 
consumer count below 0: " + this);
 return value;