From commits-return-51399-archive-asf-public=cust-asf.ponee.io@activemq.apache.org Mon May 14 15:02:02 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 39598180627 for ; Mon, 14 May 2018 15:02:02 +0200 (CEST) Received: (qmail 81937 invoked by uid 500); 14 May 2018 13:02:01 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 81928 invoked by uid 99); 14 May 2018 13:02:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 May 2018 13:02:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 00F28DFF06; Mon, 14 May 2018 13:02:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cshannon@apache.org To: commits@activemq.apache.org Date: Mon, 14 May 2018 13:02:00 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Mon May 14 15:11:10 2018 +0300 Committer: saivr1t 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());