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 2018/10/11 15:28:33 UTC

[2/5] activemq-artemis git commit: ARTEMIS-2121 reload logging config at runtime

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cbace51d/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASession.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASession.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASession.java
index ac14c00..8ac9c36 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASession.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASession.java
@@ -62,11 +62,6 @@ import org.apache.activemq.artemis.jms.client.ActiveMQSession;
 public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSession, XATopicSession {
 
    /**
-    * Trace enabled
-    */
-   private static boolean trace = ActiveMQRALogger.LOGGER.isTraceEnabled();
-
-   /**
     * The managed connection
     */
    private ActiveMQRAManagedConnection mc;
@@ -98,7 +93,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     * @param cri The connection request info
     */
    public ActiveMQRASession(final ActiveMQRAManagedConnection mc, final ActiveMQRAConnectionRequestInfo cri) {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("constructor(" + mc + ", " + cri + ")");
       }
 
@@ -115,7 +110,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     * @param sf The session factory
     */
    public void setActiveMQSessionFactory(final ActiveMQRASessionFactory sf) {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("setActiveMQSessionFactory(" + sf + ")");
       }
 
@@ -129,7 +124,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     * @throws IllegalStateException The session is closed
     */
    protected void lock() throws JMSException {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("lock()");
       }
 
@@ -145,7 +140,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     * Unlock
     */
    protected void unlock() {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("unlock()");
       }
 
@@ -168,7 +163,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
    public BytesMessage createBytesMessage() throws JMSException {
       Session session = getSessionInternal();
 
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createBytesMessage" + session);
       }
 
@@ -185,7 +180,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
    public MapMessage createMapMessage() throws JMSException {
       Session session = getSessionInternal();
 
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createMapMessage(), " + session);
       }
 
@@ -202,7 +197,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
    public Message createMessage() throws JMSException {
       Session session = getSessionInternal();
 
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createMessage" + session);
       }
 
@@ -219,7 +214,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
    public ObjectMessage createObjectMessage() throws JMSException {
       Session session = getSessionInternal();
 
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createObjectMessage" + session);
       }
 
@@ -237,7 +232,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
    public ObjectMessage createObjectMessage(final Serializable object) throws JMSException {
       Session session = getSessionInternal();
 
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createObjectMessage(" + object + ")" + session);
       }
 
@@ -254,7 +249,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
    public StreamMessage createStreamMessage() throws JMSException {
       Session session = getSessionInternal();
 
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createStreamMessage" + session);
       }
 
@@ -271,7 +266,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
    public TextMessage createTextMessage() throws JMSException {
       Session session = getSessionInternal();
 
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createTextMessage" + session);
       }
 
@@ -289,7 +284,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
    public TextMessage createTextMessage(final String string) throws JMSException {
       Session session = getSessionInternal();
 
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createTextMessage(" + string + ")" + session);
       }
 
@@ -304,7 +299,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     */
    @Override
    public boolean getTransacted() throws JMSException {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("getTransacted()");
       }
 
@@ -320,7 +315,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     */
    @Override
    public MessageListener getMessageListener() throws JMSException {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("getMessageListener()");
       }
 
@@ -335,7 +330,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     */
    @Override
    public void setMessageListener(final MessageListener listener) throws JMSException {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("setMessageListener(" + listener + ")");
       }
 
@@ -349,7 +344,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     */
    @Override
    public void run() {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("run()");
       }
 
@@ -364,7 +359,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     */
    @Override
    public void close() throws JMSException {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("close()");
       }
 
@@ -392,7 +387,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
             throw new IllegalStateException("Session is not transacted");
          }
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("Commit session " + this);
          }
 
@@ -422,7 +417,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
             throw new IllegalStateException("Session is not transacted");
          }
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("Rollback session " + this);
          }
 
@@ -447,7 +442,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
             throw new IllegalStateException("Session is transacted");
          }
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("Recover session " + this);
          }
 
@@ -472,13 +467,13 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
 
       Session session = getSessionInternal();
 
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createTopic " + session + " topicName=" + topicName);
       }
 
       Topic result = session.createTopic(topicName);
 
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createdTopic " + session + " topic=" + result);
       }
 
@@ -498,14 +493,14 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          TopicSession session = getTopicSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createSubscriber " + session + " topic=" + topic);
          }
 
          TopicSubscriber result = session.createSubscriber(topic);
          result = new ActiveMQRATopicSubscriber(result, this);
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createdSubscriber " + session + " ActiveMQTopicSubscriber=" + result);
          }
 
@@ -534,7 +529,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          TopicSession session = getTopicSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createSubscriber " + session +
                                              " topic=" +
                                              topic +
@@ -547,7 +542,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
          TopicSubscriber result = session.createSubscriber(topic, messageSelector, noLocal);
          result = new ActiveMQRATopicSubscriber(result, this);
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createdSubscriber " + session + " ActiveMQTopicSubscriber=" + result);
          }
 
@@ -577,14 +572,14 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          Session session = getSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createDurableSubscriber " + session + " topic=" + topic + " name=" + name);
          }
 
          TopicSubscriber result = session.createDurableSubscriber(topic, name);
          result = new ActiveMQRATopicSubscriber(result, this);
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createdDurableSubscriber " + session + " ActiveMQTopicSubscriber=" + result);
          }
 
@@ -615,7 +610,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          Session session = getSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createDurableSubscriber " + session +
                                              " topic=" +
                                              topic +
@@ -630,7 +625,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
          TopicSubscriber result = session.createDurableSubscriber(topic, name, messageSelector, noLocal);
          result = new ActiveMQRATopicSubscriber(result, this);
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createdDurableSubscriber " + session + " ActiveMQTopicSubscriber=" + result);
          }
 
@@ -655,14 +650,14 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          TopicSession session = getTopicSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createPublisher " + session + " topic=" + topic);
          }
 
          TopicPublisher result = session.createPublisher(topic);
          result = new ActiveMQRATopicPublisher(result, this);
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createdPublisher " + session + " publisher=" + result);
          }
 
@@ -690,13 +685,13 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          Session session = getSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createTemporaryTopic " + session);
          }
 
          TemporaryTopic temp = session.createTemporaryTopic();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createdTemporaryTopic " + session + " temp=" + temp);
          }
 
@@ -724,7 +719,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          Session session = getSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("unsubscribe " + session + " name=" + name);
          }
 
@@ -749,13 +744,13 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
 
       Session session = getSessionInternal();
 
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createBrowser " + session + " queue=" + queue);
       }
 
       QueueBrowser result = session.createBrowser(queue);
 
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createdBrowser " + session + " browser=" + result);
       }
 
@@ -778,13 +773,13 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
 
       Session session = getSessionInternal();
 
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createBrowser " + session + " queue=" + queue + " selector=" + messageSelector);
       }
 
       QueueBrowser result = session.createBrowser(queue, messageSelector);
 
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createdBrowser " + session + " browser=" + result);
       }
 
@@ -806,13 +801,13 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
 
       Session session = getSessionInternal();
 
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createQueue " + session + " queueName=" + queueName);
       }
 
       Queue result = session.createQueue(queueName);
 
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createdQueue " + session + " queue=" + result);
       }
 
@@ -832,14 +827,14 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          QueueSession session = getQueueSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createReceiver " + session + " queue=" + queue);
          }
 
          QueueReceiver result = session.createReceiver(queue);
          result = new ActiveMQRAQueueReceiver(result, this);
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createdReceiver " + session + " receiver=" + result);
          }
 
@@ -865,14 +860,14 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          QueueSession session = getQueueSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createReceiver " + session + " queue=" + queue + " selector=" + messageSelector);
          }
 
          QueueReceiver result = session.createReceiver(queue, messageSelector);
          result = new ActiveMQRAQueueReceiver(result, this);
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createdReceiver " + session + " receiver=" + result);
          }
 
@@ -897,14 +892,14 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          QueueSession session = getQueueSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createSender " + session + " queue=" + queue);
          }
 
          QueueSender result = session.createSender(queue);
          result = new ActiveMQRAQueueSender(result, this);
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createdSender " + session + " sender=" + result);
          }
 
@@ -932,13 +927,13 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          Session session = getSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createTemporaryQueue " + session);
          }
 
          TemporaryQueue temp = session.createTemporaryQueue();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createdTemporaryQueue " + session + " temp=" + temp);
          }
 
@@ -963,14 +958,14 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          Session session = getSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createConsumer " + session + " dest=" + destination);
          }
 
          MessageConsumer result = session.createConsumer(destination);
          result = new ActiveMQRAMessageConsumer(result, this);
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createdConsumer " + session + " consumer=" + result);
          }
 
@@ -997,7 +992,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          Session session = getSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createConsumer " + session +
                                              " dest=" +
                                              destination +
@@ -1008,7 +1003,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
          MessageConsumer result = session.createConsumer(destination, messageSelector);
          result = new ActiveMQRAMessageConsumer(result, this);
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createdConsumer " + session + " consumer=" + result);
          }
 
@@ -1037,7 +1032,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          Session session = getSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createConsumer " + session +
                                              " dest=" +
                                              destination +
@@ -1050,7 +1045,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
          MessageConsumer result = session.createConsumer(destination, messageSelector, noLocal);
          result = new ActiveMQRAMessageConsumer(result, this);
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createdConsumer " + session + " consumer=" + result);
          }
 
@@ -1075,14 +1070,14 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          Session session = getSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createProducer " + session + " dest=" + destination);
          }
 
          MessageProducer result = session.createProducer(destination);
          result = new ActiveMQRAMessageProducer(result, this);
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createdProducer " + session + " producer=" + result);
          }
 
@@ -1102,7 +1097,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     */
    @Override
    public int getAcknowledgeMode() throws JMSException {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("getAcknowledgeMode()");
       }
 
@@ -1115,7 +1110,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     */
    @Override
    public XAResource getXAResource() {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("getXAResource()");
       }
 
@@ -1154,7 +1149,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     */
    @Override
    public Session getSession() throws JMSException {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("getNonXAsession()");
       }
 
@@ -1179,7 +1174,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     */
    @Override
    public QueueSession getQueueSession() throws JMSException {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("getQueueSession()");
       }
 
@@ -1204,7 +1199,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     */
    @Override
    public TopicSession getTopicSession() throws JMSException {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("getTopicSession()");
       }
 
@@ -1228,14 +1223,14 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          Session session = getSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createSharedConsumer " + session + " topic=" + topic + ", sharedSubscriptionName=" + sharedSubscriptionName);
          }
 
          MessageConsumer result = session.createSharedConsumer(topic, sharedSubscriptionName);
          result = new ActiveMQRAMessageConsumer(result, this);
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createdConsumer " + session + " consumer=" + result);
          }
 
@@ -1255,7 +1250,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          Session session = getSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createSharedConsumer " + session + " topic=" + topic +
                                              ", sharedSubscriptionName=" + sharedSubscriptionName + ", messageSelector=" + messageSelector);
          }
@@ -1263,7 +1258,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
          MessageConsumer result = session.createSharedConsumer(topic, sharedSubscriptionName, messageSelector);
          result = new ActiveMQRAMessageConsumer(result, this);
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createdConsumer " + session + " consumer=" + result);
          }
 
@@ -1281,14 +1276,14 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          Session session = getSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createSharedConsumer " + session + " topic=" + topic + ", name=" + name);
          }
 
          MessageConsumer result = session.createDurableConsumer(topic, name);
          result = new ActiveMQRAMessageConsumer(result, this);
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createdConsumer " + session + " consumer=" + result);
          }
 
@@ -1309,7 +1304,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          Session session = getSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createDurableConsumer " + session + " topic=" + topic + ", name=" + name +
                                              ", messageSelector=" + messageSelector + ", noLocal=" + noLocal);
          }
@@ -1317,7 +1312,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
          MessageConsumer result = session.createDurableConsumer(topic, name, messageSelector, noLocal);
          result = new ActiveMQRAMessageConsumer(result, this);
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createdConsumer " + session + " consumer=" + result);
          }
 
@@ -1335,7 +1330,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          Session session = getSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createSharedDurableConsumer " + session + " topic=" + topic + ", name=" +
                                              name);
          }
@@ -1343,7 +1338,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
          MessageConsumer result = session.createSharedDurableConsumer(topic, name);
          result = new ActiveMQRAMessageConsumer(result, this);
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createdConsumer " + session + " consumer=" + result);
          }
 
@@ -1363,7 +1358,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          Session session = getSessionInternal();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createSharedDurableConsumer " + session + " topic=" + topic + ", name=" +
                                              name + ", messageSelector=" + messageSelector);
          }
@@ -1371,7 +1366,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
          MessageConsumer result = session.createSharedDurableConsumer(topic, name, messageSelector);
          result = new ActiveMQRAMessageConsumer(result, this);
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("createdConsumer " + session + " consumer=" + result);
          }
 
@@ -1389,7 +1384,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     * @param managedConnection The managed connection
     */
    void setManagedConnection(final ActiveMQRAManagedConnection managedConnection) {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("setManagedConnection(" + managedConnection + ")");
       }
 
@@ -1411,7 +1406,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     * Destroy
     */
    void destroy() {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("destroy()");
       }
 
@@ -1424,7 +1419,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     * @throws JMSException Thrown if an error occurs
     */
    void start() throws JMSException {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("start()");
       }
 
@@ -1439,7 +1434,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     * @throws JMSException Thrown if an error occurs
     */
    void stop() throws JMSException {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("stop()");
       }
 
@@ -1454,7 +1449,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     * @throws JMSException Thrown if an error occurs
     */
    void checkStrict() throws JMSException {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("checkStrict()");
       }
 
@@ -1516,7 +1511,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     * @param consumer The consumer
     */
    void addConsumer(final MessageConsumer consumer) {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("addConsumer(" + consumer + ")");
       }
 
@@ -1531,7 +1526,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     * @param consumer The consumer
     */
    void removeConsumer(final MessageConsumer consumer) {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("removeConsumer(" + consumer + ")");
       }
 
@@ -1546,7 +1541,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     * @param producer The producer
     */
    void addProducer(final MessageProducer producer) {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("addProducer(" + producer + ")");
       }
 
@@ -1561,7 +1556,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
     * @param producer The producer
     */
    void removeProducer(final MessageProducer producer) {
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("removeProducer(" + producer + ")");
       }
 
@@ -1584,7 +1579,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
 
       Session session = mc.getSession();
 
-      if (ActiveMQRASession.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("getSessionInternal " + session + " for " + this);
       }
 
@@ -1606,7 +1601,7 @@ public class ActiveMQRASession implements QueueSession, TopicSession, XAQueueSes
       try {
          XAResource xares = mc.getXAResource();
 
-         if (ActiveMQRASession.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("getXAResourceInternal " + xares + " for " + this);
          }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cbace51d/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASessionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASessionFactoryImpl.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASessionFactoryImpl.java
index 0716bac..4073438 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASessionFactoryImpl.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASessionFactoryImpl.java
@@ -55,11 +55,6 @@ import org.apache.activemq.artemis.jms.client.ActiveMQConnectionForContextImpl;
 public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForContextImpl implements ActiveMQRASessionFactory, ActiveMQConnectionForContext, Referenceable {
 
    /**
-    * Trace enabled
-    */
-   private static boolean trace = ActiveMQRALogger.LOGGER.isTraceEnabled();
-
-   /**
     * Are we closed?
     */
    private boolean closed = false;
@@ -145,7 +140,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
 
       this.type = type;
 
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("constructor(" + mcf + ", " + cm + ", " + type);
       }
    }
@@ -196,7 +191,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     */
    @Override
    public void setReference(final Reference reference) {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("setReference(" + reference + ")");
       }
 
@@ -210,7 +205,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     */
    @Override
    public Reference getReference() {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("getReference()");
       }
 
@@ -223,7 +218,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     * @param name The user name
     */
    public void setUserName(final String name) {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("setUserName(" + name + ")");
       }
 
@@ -236,7 +231,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     * @param password The password
     */
    public void setPassword(final String password) {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("setPassword(****)");
       }
 
@@ -251,7 +246,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     */
    @Override
    public String getClientID() throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("getClientID()");
       }
 
@@ -272,7 +267,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     */
    @Override
    public void setClientID(final String cID) throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("setClientID(" + cID + ")");
       }
 
@@ -289,7 +284,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     */
    @Override
    public QueueSession createQueueSession(final boolean transacted, final int acknowledgeMode) throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createQueueSession(" + transacted + ", " + acknowledgeMode + ")");
       }
 
@@ -310,7 +305,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     */
    @Override
    public XAQueueSession createXAQueueSession() throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createXAQueueSession()");
       }
 
@@ -339,7 +334,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
                                                       final String messageSelector,
                                                       final ServerSessionPool sessionPool,
                                                       final int maxMessages) throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createConnectionConsumer(" + queue +
                                           ", " +
                                           messageSelector +
@@ -363,7 +358,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     */
    @Override
    public TopicSession createTopicSession(final boolean transacted, final int acknowledgeMode) throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createTopicSession(" + transacted + ", " + acknowledgeMode + ")");
       }
 
@@ -384,7 +379,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     */
    @Override
    public XATopicSession createXATopicSession() throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createXATopicSession()");
       }
 
@@ -413,7 +408,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
                                                       final String messageSelector,
                                                       final ServerSessionPool sessionPool,
                                                       final int maxMessages) throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createConnectionConsumer(" + topic +
                                           ", " +
                                           messageSelector +
@@ -444,7 +439,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
                                                              final String messageSelector,
                                                              final ServerSessionPool sessionPool,
                                                              final int maxMessages) throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createConnectionConsumer(" + topic +
                                           ", " +
                                           subscriptionName +
@@ -472,7 +467,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
    public ConnectionConsumer createConnectionConsumer(final Destination destination,
                                                       final ServerSessionPool pool,
                                                       final int maxMessages) throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createConnectionConsumer(" + destination +
                                           ", " +
                                           pool +
@@ -499,7 +494,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
                                                       final String name,
                                                       final ServerSessionPool pool,
                                                       final int maxMessages) throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createConnectionConsumer(" + destination +
                                           ", " +
                                           name +
@@ -523,7 +518,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     */
    @Override
    public Session createSession(final boolean transacted, final int acknowledgeMode) throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createSession(" + transacted + ", " + acknowledgeMode + ")");
       }
 
@@ -539,7 +534,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     */
    @Override
    public XASession createXASession() throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createXASession()");
       }
 
@@ -555,7 +550,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     */
    @Override
    public ConnectionMetaData getMetaData() throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("getMetaData()");
       }
 
@@ -571,7 +566,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     */
    @Override
    public ExceptionListener getExceptionListener() throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("getExceptionListener()");
       }
 
@@ -586,7 +581,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     */
    @Override
    public void setExceptionListener(final ExceptionListener listener) throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("setExceptionListener(" + listener + ")");
       }
 
@@ -602,7 +597,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
    public void start() throws JMSException {
       checkClosed();
 
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("start() " + this);
       }
 
@@ -625,7 +620,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     */
    @Override
    public void stop() throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("stop() " + this);
       }
 
@@ -639,7 +634,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     */
    @Override
    public void close() throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("close() " + this);
       }
 
@@ -665,7 +660,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
          for (Iterator<TemporaryQueue> i = tempQueues.iterator(); i.hasNext(); ) {
             TemporaryQueue temp = i.next();
             try {
-               if (ActiveMQRASessionFactoryImpl.trace) {
+               if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
                   ActiveMQRALogger.LOGGER.trace("Closing temporary queue " + temp + " for " + this);
                }
                temp.delete();
@@ -680,7 +675,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
          for (Iterator<TemporaryTopic> i = tempTopics.iterator(); i.hasNext(); ) {
             TemporaryTopic temp = i.next();
             try {
-               if (ActiveMQRASessionFactoryImpl.trace) {
+               if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
                   ActiveMQRALogger.LOGGER.trace("Closing temporary topic " + temp + " for " + this);
                }
                temp.delete();
@@ -700,7 +695,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     */
    @Override
    public void closeSession(final ActiveMQRASession session) throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("closeSession(" + session + ")");
       }
 
@@ -716,7 +711,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     */
    @Override
    public void addTemporaryQueue(final TemporaryQueue temp) {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("addTemporaryQueue(" + temp + ")");
       }
 
@@ -732,7 +727,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     */
    @Override
    public void addTemporaryTopic(final TemporaryTopic temp) {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("addTemporaryTopic(" + temp + ")");
       }
 
@@ -757,7 +752,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
                                                             String messageSelector,
                                                             ServerSessionPool sessionPool,
                                                             int maxMessages) throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createSharedConnectionConsumer(" + topic + ", " + subscriptionName + ", " +
                                           messageSelector + ", " + sessionPool + ", " + maxMessages + ")");
       }
@@ -771,7 +766,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
                                                                    String messageSelector,
                                                                    ServerSessionPool sessionPool,
                                                                    int maxMessages) throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("createSharedDurableConnectionConsumer(" + topic + ", " + subscriptionName +
                                           ", " + messageSelector + ", " + sessionPool + ", " + maxMessages + ")");
       }
@@ -802,7 +797,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
    protected ActiveMQRASession allocateConnection(boolean transacted,
                                                   int acknowledgeMode,
                                                   final int sessionType) throws JMSException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("allocateConnection(" + transacted +
                                           ", " +
                                           acknowledgeMode +
@@ -865,14 +860,14 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
             info.setClientID(clientID);
             info.setDefaults(((ActiveMQResourceAdapter) mcf.getResourceAdapter()).getProperties());
 
-            if (ActiveMQRASessionFactoryImpl.trace) {
+            if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
                ActiveMQRALogger.LOGGER.trace("Allocating session for " + this + " with request info=" + info);
             }
 
             ActiveMQRASession session = (ActiveMQRASession) cm.allocateConnection(mcf, info);
 
             try {
-               if (ActiveMQRASessionFactoryImpl.trace) {
+               if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
                   ActiveMQRALogger.LOGGER.trace("Allocated  " + this + " session=" + session);
                }
 
@@ -920,7 +915,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon
     * @throws IllegalStateException Thrown if closed
     */
    protected void checkClosed() throws IllegalStateException {
-      if (ActiveMQRASessionFactoryImpl.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("checkClosed()" + this);
       }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cbace51d/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAStreamMessage.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAStreamMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAStreamMessage.java
index ede85ee..d364bae 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAStreamMessage.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAStreamMessage.java
@@ -26,11 +26,6 @@ import java.util.Arrays;
 public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements StreamMessage {
 
    /**
-    * Whether trace is enabled
-    */
-   private static boolean trace = ActiveMQRALogger.LOGGER.isTraceEnabled();
-
-   /**
     * Create a new wrapper
     *
     * @param message the message
@@ -39,7 +34,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
    public ActiveMQRAStreamMessage(final StreamMessage message, final ActiveMQRASession session) {
       super(message, session);
 
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("constructor(" + message + ", " + session + ")");
       }
    }
@@ -52,7 +47,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public boolean readBoolean() throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("readBoolean()");
       }
 
@@ -67,7 +62,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public byte readByte() throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("readByte()");
       }
 
@@ -83,7 +78,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public int readBytes(final byte[] value) throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("readBytes(" + Arrays.toString(value) + ")");
       }
 
@@ -98,7 +93,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public char readChar() throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("readChar()");
       }
 
@@ -113,7 +108,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public double readDouble() throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("readDouble()");
       }
 
@@ -128,7 +123,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public float readFloat() throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("readFloat()");
       }
 
@@ -143,7 +138,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public int readInt() throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("readInt()");
       }
 
@@ -158,7 +153,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public long readLong() throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("readLong()");
       }
 
@@ -173,7 +168,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public Object readObject() throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("readObject()");
       }
 
@@ -188,7 +183,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public short readShort() throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("readShort()");
       }
 
@@ -203,7 +198,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public String readString() throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("readString()");
       }
 
@@ -217,7 +212,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public void reset() throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("reset()");
       }
 
@@ -232,7 +227,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public void writeBoolean(final boolean value) throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("writeBoolean(" + value + ")");
       }
 
@@ -247,7 +242,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public void writeByte(final byte value) throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("writeByte(" + value + ")");
       }
 
@@ -264,7 +259,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public void writeBytes(final byte[] value, final int offset, final int length) throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("writeBytes(" + Arrays.toString(value) + ", " + offset + ", " + length + ")");
       }
 
@@ -279,7 +274,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public void writeBytes(final byte[] value) throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("writeBytes(" + Arrays.toString(value) + ")");
       }
 
@@ -294,7 +289,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public void writeChar(final char value) throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("writeChar(" + value + ")");
       }
 
@@ -309,7 +304,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public void writeDouble(final double value) throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("writeDouble(" + value + ")");
       }
 
@@ -324,7 +319,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public void writeFloat(final float value) throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("writeFloat(" + value + ")");
       }
 
@@ -339,7 +334,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public void writeInt(final int value) throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("writeInt(" + value + ")");
       }
 
@@ -354,7 +349,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public void writeLong(final long value) throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("writeLong(" + value + ")");
       }
 
@@ -369,7 +364,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public void writeObject(final Object value) throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("writeObject(" + value + ")");
       }
 
@@ -384,7 +379,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public void writeShort(final short value) throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("writeShort(" + value + ")");
       }
 
@@ -399,7 +394,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
     */
    @Override
    public void writeString(final String value) throws JMSException {
-      if (ActiveMQRAStreamMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("writeString(" + value + ")");
       }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cbace51d/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATextMessage.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATextMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATextMessage.java
index d4c3c07..ec27eb2 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATextMessage.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATextMessage.java
@@ -25,11 +25,6 @@ import javax.jms.TextMessage;
 public class ActiveMQRATextMessage extends ActiveMQRAMessage implements TextMessage {
 
    /**
-    * Whether trace is enabled
-    */
-   private static boolean trace = ActiveMQRALogger.LOGGER.isTraceEnabled();
-
-   /**
     * Create a new wrapper
     *
     * @param message the message
@@ -38,7 +33,7 @@ public class ActiveMQRATextMessage extends ActiveMQRAMessage implements TextMess
    public ActiveMQRATextMessage(final TextMessage message, final ActiveMQRASession session) {
       super(message, session);
 
-      if (ActiveMQRATextMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("constructor(" + message + ", " + session + ")");
       }
    }
@@ -51,7 +46,7 @@ public class ActiveMQRATextMessage extends ActiveMQRAMessage implements TextMess
     */
    @Override
    public String getText() throws JMSException {
-      if (ActiveMQRATextMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("getText()");
       }
 
@@ -66,7 +61,7 @@ public class ActiveMQRATextMessage extends ActiveMQRAMessage implements TextMess
     */
    @Override
    public void setText(final String string) throws JMSException {
-      if (ActiveMQRATextMessage.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("setText(" + string + ")");
       }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cbace51d/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATopicPublisher.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATopicPublisher.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATopicPublisher.java
index ee40f72..e86e4ab 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATopicPublisher.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATopicPublisher.java
@@ -27,11 +27,6 @@ import javax.jms.TopicPublisher;
 public class ActiveMQRATopicPublisher extends ActiveMQRAMessageProducer implements TopicPublisher {
 
    /**
-    * Whether trace is enabled
-    */
-   private static boolean trace = ActiveMQRALogger.LOGGER.isTraceEnabled();
-
-   /**
     * Create a new wrapper
     *
     * @param producer the producer
@@ -40,7 +35,7 @@ public class ActiveMQRATopicPublisher extends ActiveMQRAMessageProducer implemen
    public ActiveMQRATopicPublisher(final TopicPublisher producer, final ActiveMQRASession session) {
       super(producer, session);
 
-      if (ActiveMQRATopicPublisher.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("constructor(" + producer + ", " + session + ")");
       }
    }
@@ -53,7 +48,7 @@ public class ActiveMQRATopicPublisher extends ActiveMQRAMessageProducer implemen
     */
    @Override
    public Topic getTopic() throws JMSException {
-      if (ActiveMQRATopicPublisher.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("getTopic()");
       }
 
@@ -76,7 +71,7 @@ public class ActiveMQRATopicPublisher extends ActiveMQRAMessageProducer implemen
                        final long timeToLive) throws JMSException {
       session.lock();
       try {
-         if (ActiveMQRATopicPublisher.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("send " + this +
                                              " message=" +
                                              message +
@@ -92,7 +87,7 @@ public class ActiveMQRATopicPublisher extends ActiveMQRAMessageProducer implemen
 
          ((TopicPublisher) producer).publish(message, deliveryMode, priority, timeToLive);
 
-         if (ActiveMQRATopicPublisher.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("sent " + this + " result=" + message);
          }
       } finally {
@@ -110,7 +105,7 @@ public class ActiveMQRATopicPublisher extends ActiveMQRAMessageProducer implemen
    public void publish(final Message message) throws JMSException {
       session.lock();
       try {
-         if (ActiveMQRATopicPublisher.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("send " + this + " message=" + message);
          }
 
@@ -118,7 +113,7 @@ public class ActiveMQRATopicPublisher extends ActiveMQRAMessageProducer implemen
 
          ((TopicPublisher) producer).publish(message);
 
-         if (ActiveMQRATopicPublisher.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("sent " + this + " result=" + message);
          }
       } finally {
@@ -144,7 +139,7 @@ public class ActiveMQRATopicPublisher extends ActiveMQRAMessageProducer implemen
                        final long timeToLive) throws JMSException {
       session.lock();
       try {
-         if (ActiveMQRATopicPublisher.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("send " + this +
                                              " destination=" +
                                              destination +
@@ -162,7 +157,7 @@ public class ActiveMQRATopicPublisher extends ActiveMQRAMessageProducer implemen
 
          ((TopicPublisher) producer).publish(destination, message, deliveryMode, priority, timeToLive);
 
-         if (ActiveMQRATopicPublisher.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("sent " + this + " result=" + message);
          }
       } finally {
@@ -181,7 +176,7 @@ public class ActiveMQRATopicPublisher extends ActiveMQRAMessageProducer implemen
    public void publish(final Topic destination, final Message message) throws JMSException {
       session.lock();
       try {
-         if (ActiveMQRATopicPublisher.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("send " + this + " destination=" + destination + " message=" + message);
          }
 
@@ -189,7 +184,7 @@ public class ActiveMQRATopicPublisher extends ActiveMQRAMessageProducer implemen
 
          ((TopicPublisher) producer).publish(destination, message);
 
-         if (ActiveMQRATopicPublisher.trace) {
+         if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
             ActiveMQRALogger.LOGGER.trace("sent " + this + " result=" + message);
          }
       } finally {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cbace51d/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATopicSubscriber.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATopicSubscriber.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATopicSubscriber.java
index 7c9115b..ff12d9c 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATopicSubscriber.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATopicSubscriber.java
@@ -26,11 +26,6 @@ import javax.jms.TopicSubscriber;
 public class ActiveMQRATopicSubscriber extends ActiveMQRAMessageConsumer implements TopicSubscriber {
 
    /**
-    * Whether trace is enabled
-    */
-   private static boolean trace = ActiveMQRALogger.LOGGER.isTraceEnabled();
-
-   /**
     * Create a new wrapper
     *
     * @param consumer the topic subscriber
@@ -39,7 +34,7 @@ public class ActiveMQRATopicSubscriber extends ActiveMQRAMessageConsumer impleme
    public ActiveMQRATopicSubscriber(final TopicSubscriber consumer, final ActiveMQRASession session) {
       super(consumer, session);
 
-      if (ActiveMQRATopicSubscriber.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("constructor(" + consumer + ", " + session + ")");
       }
    }
@@ -52,7 +47,7 @@ public class ActiveMQRATopicSubscriber extends ActiveMQRAMessageConsumer impleme
     */
    @Override
    public boolean getNoLocal() throws JMSException {
-      if (ActiveMQRATopicSubscriber.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("getNoLocal()");
       }
 
@@ -68,7 +63,7 @@ public class ActiveMQRATopicSubscriber extends ActiveMQRAMessageConsumer impleme
     */
    @Override
    public Topic getTopic() throws JMSException {
-      if (ActiveMQRATopicSubscriber.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("getTopic()");
       }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cbace51d/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAXAResource.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAXAResource.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAXAResource.java
index 3f908c4..d6d246e 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAXAResource.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAXAResource.java
@@ -30,11 +30,6 @@ import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
 public class ActiveMQRAXAResource implements ActiveMQXAResource {
 
    /**
-    * Trace enabled
-    */
-   private static boolean trace = ActiveMQRALogger.LOGGER.isTraceEnabled();
-
-   /**
     * The managed connection
     */
    private final ActiveMQRAManagedConnection managedConnection;
@@ -51,7 +46,7 @@ public class ActiveMQRAXAResource implements ActiveMQXAResource {
     * @param xaResource        the xa resource
     */
    public ActiveMQRAXAResource(final ActiveMQRAManagedConnection managedConnection, final XAResource xaResource) {
-      if (ActiveMQRAXAResource.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("constructor(" + managedConnection + ", " + xaResource + ")");
       }
 
@@ -68,7 +63,7 @@ public class ActiveMQRAXAResource implements ActiveMQXAResource {
     */
    @Override
    public void start(final Xid xid, final int flags) throws XAException {
-      if (ActiveMQRAXAResource.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("start(" + xid + ", " + flags + ")");
       }
 
@@ -103,7 +98,7 @@ public class ActiveMQRAXAResource implements ActiveMQXAResource {
     */
    @Override
    public void end(final Xid xid, final int flags) throws XAException {
-      if (ActiveMQRAXAResource.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("end(" + xid + ", " + flags + ")");
       }
 
@@ -125,7 +120,7 @@ public class ActiveMQRAXAResource implements ActiveMQXAResource {
     */
    @Override
    public int prepare(final Xid xid) throws XAException {
-      if (ActiveMQRAXAResource.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("prepare(" + xid + ")");
       }
 
@@ -141,7 +136,7 @@ public class ActiveMQRAXAResource implements ActiveMQXAResource {
     */
    @Override
    public void commit(final Xid xid, final boolean onePhase) throws XAException {
-      if (ActiveMQRAXAResource.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("commit(" + xid + ", " + onePhase + ")");
       }
 
@@ -156,7 +151,7 @@ public class ActiveMQRAXAResource implements ActiveMQXAResource {
     */
    @Override
    public void rollback(final Xid xid) throws XAException {
-      if (ActiveMQRAXAResource.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("rollback(" + xid + ")");
       }
 
@@ -171,7 +166,7 @@ public class ActiveMQRAXAResource implements ActiveMQXAResource {
     */
    @Override
    public void forget(final Xid xid) throws XAException {
-      if (ActiveMQRAXAResource.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("forget(" + xid + ")");
       }
 
@@ -194,7 +189,7 @@ public class ActiveMQRAXAResource implements ActiveMQXAResource {
     */
    @Override
    public boolean isSameRM(final XAResource xaRes) throws XAException {
-      if (ActiveMQRAXAResource.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("isSameRM(" + xaRes + ")");
       }
 
@@ -210,7 +205,7 @@ public class ActiveMQRAXAResource implements ActiveMQXAResource {
     */
    @Override
    public Xid[] recover(final int flag) throws XAException {
-      if (ActiveMQRAXAResource.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("recover(" + flag + ")");
       }
 
@@ -225,7 +220,7 @@ public class ActiveMQRAXAResource implements ActiveMQXAResource {
     */
    @Override
    public int getTransactionTimeout() throws XAException {
-      if (ActiveMQRAXAResource.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("getTransactionTimeout()");
       }
 
@@ -241,7 +236,7 @@ public class ActiveMQRAXAResource implements ActiveMQXAResource {
     */
    @Override
    public boolean setTransactionTimeout(final int seconds) throws XAException {
-      if (ActiveMQRAXAResource.trace) {
+      if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
          ActiveMQRALogger.LOGGER.trace("setTransactionTimeout(" + seconds + ")");
       }