You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/06/09 18:44:22 UTC
[1/3] activemq-artemis git commit: [ARTEMIS-561] Using long for
counters, and renaming variables
Repository: activemq-artemis
Updated Branches:
refs/heads/master bafa59cc3 -> 7c2e58606
[ARTEMIS-561] Using long for counters, and renaming variables
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d554301c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d554301c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d554301c
Branch: refs/heads/master
Commit: d554301c70293e4a3c4b1c802900cc50898b0b0d
Parents: 0ed7f58
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Jun 9 14:14:18 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Jun 9 14:15:25 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/jms/bridge/JMSBridge.java | 4 ++--
.../artemis/jms/bridge/impl/JMSBridgeImpl.java | 20 ++++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d554301c/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/JMSBridge.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/JMSBridge.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/JMSBridge.java
index 1f9a082..a7e67c2 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/JMSBridge.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/JMSBridge.java
@@ -90,9 +90,9 @@ public interface JMSBridge extends ActiveMQComponent {
boolean isFailed();
- int getMessageCount();
+ long getMessageCount();
- int getabortedMessageCount();
+ long getAbortedMessageCount();
void setSourceConnectionFactoryFactory(ConnectionFactoryFactory cff);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d554301c/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
index 3ff639e..46cc0d4 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
@@ -181,9 +181,9 @@ public final class JMSBridgeImpl implements JMSBridge {
private ClassLoader moduleTccl;
- private int message_count = 0;
+ private long messageCount = 0;
- private int aborted_message_count = 0;
+ private long abortedMessageCount = 0;
/*
* Constructor for MBean
@@ -492,7 +492,7 @@ public final class JMSBridgeImpl implements JMSBridge {
try {
tx.rollback();
- aborted_message_count += messages.size();
+ abortedMessageCount += messages.size();
}
catch (Exception ignore) {
if (JMSBridgeImpl.trace) {
@@ -780,13 +780,13 @@ public final class JMSBridgeImpl implements JMSBridge {
}
@Override
- public synchronized int getMessageCount() {
- return message_count;
+ public synchronized long getMessageCount() {
+ return messageCount;
}
@Override
- public synchronized int getabortedMessageCount() {
- return aborted_message_count;
+ public synchronized long getAbortedMessageCount() {
+ return abortedMessageCount;
}
@Override
@@ -1214,7 +1214,7 @@ public final class JMSBridgeImpl implements JMSBridge {
try {
// Terminate the tx
tx.rollback();
- aborted_message_count += messages.size();
+ abortedMessageCount += messages.size();
}
catch (Throwable ignore) {
if (JMSBridgeImpl.trace) {
@@ -1414,7 +1414,7 @@ public final class JMSBridgeImpl implements JMSBridge {
try {
// we call this just in case there is a failure other than failover
tx.rollback();
- aborted_message_count += messages.size();
+ abortedMessageCount += messages.size();
}
catch (Throwable ignored) {
}
@@ -1511,7 +1511,7 @@ public final class JMSBridgeImpl implements JMSBridge {
targetProducer.send(targetDestination, msg, msg.getJMSDeliveryMode(), msg.getJMSPriority(), timeToLive);
if (msg != null)
- message_count++;
+ messageCount++;
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace("Sent message " + msg);
}
[2/3] activemq-artemis git commit: [ARTEMIS-561] JMS Bridge should
display statistics about messages that have been processed
Posted by cl...@apache.org.
[ARTEMIS-561] JMS Bridge should display statistics about messages that have been processed
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/0ed7f586
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/0ed7f586
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/0ed7f586
Branch: refs/heads/master
Commit: 0ed7f586a8c93f8273063ef4139f9a674f98949b
Parents: bafa59c
Author: bayern39 <mc...@redhat.com>
Authored: Wed Jun 8 17:22:05 2016 +0800
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Jun 9 14:15:25 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/jms/bridge/JMSBridge.java | 4 ++++
.../artemis/jms/bridge/impl/JMSBridgeImpl.java | 19 +++++++++++++++++++
2 files changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0ed7f586/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/JMSBridge.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/JMSBridge.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/JMSBridge.java
index f42aa30..1f9a082 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/JMSBridge.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/JMSBridge.java
@@ -90,6 +90,10 @@ public interface JMSBridge extends ActiveMQComponent {
boolean isFailed();
+ int getMessageCount();
+
+ int getabortedMessageCount();
+
void setSourceConnectionFactoryFactory(ConnectionFactoryFactory cff);
void setTargetConnectionFactoryFactory(ConnectionFactoryFactory cff);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0ed7f586/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
index e5168e7..3ff639e 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
@@ -181,6 +181,10 @@ public final class JMSBridgeImpl implements JMSBridge {
private ClassLoader moduleTccl;
+ private int message_count = 0;
+
+ private int aborted_message_count = 0;
+
/*
* Constructor for MBean
*/
@@ -488,6 +492,7 @@ public final class JMSBridgeImpl implements JMSBridge {
try {
tx.rollback();
+ aborted_message_count += messages.size();
}
catch (Exception ignore) {
if (JMSBridgeImpl.trace) {
@@ -775,6 +780,16 @@ public final class JMSBridgeImpl implements JMSBridge {
}
@Override
+ public synchronized int getMessageCount() {
+ return message_count;
+ }
+
+ @Override
+ public synchronized int getabortedMessageCount() {
+ return aborted_message_count;
+ }
+
+ @Override
public synchronized void setSourceConnectionFactoryFactory(final ConnectionFactoryFactory cff) {
checkBridgeNotStarted();
JMSBridgeImpl.checkNotNull(cff, "SourceConnectionFactoryFactory");
@@ -1199,6 +1214,7 @@ public final class JMSBridgeImpl implements JMSBridge {
try {
// Terminate the tx
tx.rollback();
+ aborted_message_count += messages.size();
}
catch (Throwable ignore) {
if (JMSBridgeImpl.trace) {
@@ -1398,6 +1414,7 @@ public final class JMSBridgeImpl implements JMSBridge {
try {
// we call this just in case there is a failure other than failover
tx.rollback();
+ aborted_message_count += messages.size();
}
catch (Throwable ignored) {
}
@@ -1493,6 +1510,8 @@ public final class JMSBridgeImpl implements JMSBridge {
targetProducer.send(targetDestination, msg, msg.getJMSDeliveryMode(), msg.getJMSPriority(), timeToLive);
+ if (msg != null)
+ message_count++;
if (JMSBridgeImpl.trace) {
ActiveMQJMSBridgeLogger.LOGGER.trace("Sent message " + msg);
}
[3/3] activemq-artemis git commit: This closes #571
Posted by cl...@apache.org.
This closes #571
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7c2e5860
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7c2e5860
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7c2e5860
Branch: refs/heads/master
Commit: 7c2e58606f5a0d5ff6a7c6301ff26e8429dc1c40
Parents: bafa59c d554301
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Jun 9 14:15:43 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Jun 9 14:15:43 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/jms/bridge/JMSBridge.java | 4 ++++
.../artemis/jms/bridge/impl/JMSBridgeImpl.java | 19 +++++++++++++++++++
2 files changed, 23 insertions(+)
----------------------------------------------------------------------