You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2018/05/14 13:02:00 UTC
[1/2] activemq git commit: AMQ-6959 Avoid creating a Throwable in
case of non-trace logging
Repository: activemq
Updated Branches:
refs/heads/master b8cfab97d -> 365c1bbe9
AMQ-6959
Avoid creating a Throwable in case of non-trace logging
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/2a953481
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/2a953481
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/2a953481
Branch: refs/heads/master
Commit: 2a953481821fcbfefbdd235a2c5b7f7e7ef8a6b7
Parents: b8cfab9
Author: saivr1t <al...@gmail.com>
Authored: Mon May 14 15:11:10 2018 +0300
Committer: saivr1t <al...@gmail.com>
Committed: Mon May 14 15:11:10 2018 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/activemq/ActiveMQSession.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/2a953481/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java
----------------------------------------------------------------------
diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java
index 1e82af8..af043d0 100644
--- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java
+++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java
@@ -950,7 +950,9 @@ public class ActiveMQSession implements Session, QueueSession, TopicSession, Sta
@Override
public void afterRollback() throws Exception {
- LOG.trace("rollback {}", ack, new Throwable("here"));
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("rollback {}", ack, new Throwable("here"));
+ }
// ensure we don't filter this as a duplicate
connection.rollbackDuplicate(ActiveMQSession.this, md.getMessage());
[2/2] activemq git commit: Merge branch 'AMQ-6959'
Posted by cs...@apache.org.
Merge branch 'AMQ-6959'
This closes #282
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/365c1bbe
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/365c1bbe
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/365c1bbe
Branch: refs/heads/master
Commit: 365c1bbe9a189a652ff2774d6741b3c65286ff01
Parents: b8cfab9 2a95348
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Authored: Mon May 14 09:01:00 2018 -0400
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Mon May 14 09:01:00 2018 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/activemq/ActiveMQSession.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------