http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cbace51d/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java ---------------------------------------------------------------------- diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java index 70e5005..f70385a 100644 --- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java @@ -27,11 +27,6 @@ import java.util.Enumeration; public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessage { /** - * Whether trace is enabled - */ - private static boolean trace = ActiveMQRALogger.LOGGER.isTraceEnabled(); - - /** * Create a new wrapper * * @param message the message @@ -40,7 +35,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag public ActiveMQRAMapMessage(final MapMessage message, final ActiveMQRASession session) { super(message, session); - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("constructor(" + message + ", " + session + ")"); } } @@ -54,7 +49,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public boolean getBoolean(final String name) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getBoolean(" + name + ")"); } @@ -70,7 +65,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public byte getByte(final String name) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getByte(" + name + ")"); } @@ -86,7 +81,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public byte[] getBytes(final String name) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getBytes(" + name + ")"); } @@ -102,7 +97,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public char getChar(final String name) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getChar(" + name + ")"); } @@ -118,7 +113,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public double getDouble(final String name) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getDouble(" + name + ")"); } @@ -134,7 +129,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public float getFloat(final String name) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getFloat(" + name + ")"); } @@ -150,7 +145,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public int getInt(final String name) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getInt(" + name + ")"); } @@ -166,7 +161,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public long getLong(final String name) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getLong(" + name + ")"); } @@ -181,7 +176,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public Enumeration getMapNames() throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getMapNames()"); } @@ -197,7 +192,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public Object getObject(final String name) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getObject(" + name + ")"); } @@ -213,7 +208,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public short getShort(final String name) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getShort(" + name + ")"); } @@ -229,7 +224,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public String getString(final String name) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getString(" + name + ")"); } @@ -245,7 +240,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public boolean itemExists(final String name) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("itemExists(" + name + ")"); } @@ -261,7 +256,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public void setBoolean(final String name, final boolean value) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setBoolean(" + name + ", " + value + ")"); } @@ -277,7 +272,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public void setByte(final String name, final byte value) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setByte(" + name + ", " + value + ")"); } @@ -295,7 +290,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public void setBytes(final String name, final byte[] value, final int offset, final int length) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setBytes(" + name + ", " + Arrays.toString(value) + ", " + offset + ", " + length + ")"); } @@ -312,7 +307,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public void setBytes(final String name, final byte[] value) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setBytes(" + name + ", " + Arrays.toString(value) + ")"); } @@ -328,7 +323,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public void setChar(final String name, final char value) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setChar(" + name + ", " + value + ")"); } @@ -344,7 +339,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public void setDouble(final String name, final double value) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setDouble(" + name + ", " + value + ")"); } @@ -360,7 +355,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public void setFloat(final String name, final float value) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setFloat(" + name + ", " + value + ")"); } @@ -376,7 +371,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public void setInt(final String name, final int value) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setInt(" + name + ", " + value + ")"); } @@ -392,7 +387,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public void setLong(final String name, final long value) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setLong(" + name + ", " + value + ")"); } @@ -408,7 +403,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public void setObject(final String name, final Object value) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setObject(" + name + ", " + value + ")"); } @@ -424,7 +419,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public void setShort(final String name, final short value) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setShort(" + name + ", " + value + ")"); } @@ -440,7 +435,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag */ @Override public void setString(final String name, final String value) throws JMSException { - if (ActiveMQRAMapMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setString(" + name + ", " + value + ")"); }
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cbace51d/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java ---------------------------------------------------------------------- diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java index 9b49466..39d9fa9 100644 --- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java @@ -28,11 +28,6 @@ import java.util.Enumeration; public class ActiveMQRAMessage implements Message { /** - * Whether trace is enabled - */ - private static boolean trace = ActiveMQRALogger.LOGGER.isTraceEnabled(); - - /** * The message */ protected Message message; @@ -49,7 +44,7 @@ public class ActiveMQRAMessage implements Message { * @param session the session */ public ActiveMQRAMessage(final Message message, final ActiveMQRASession session) { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("constructor(" + message + ", " + session + ")"); } @@ -64,7 +59,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void acknowledge() throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("acknowledge()"); } @@ -79,7 +74,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void clearBody() throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("clearBody()"); } @@ -93,7 +88,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void clearProperties() throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("clearProperties()"); } @@ -109,7 +104,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public boolean getBooleanProperty(final String name) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getBooleanProperty(" + name + ")"); } @@ -125,7 +120,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public byte getByteProperty(final String name) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getByteProperty(" + name + ")"); } @@ -141,7 +136,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public double getDoubleProperty(final String name) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getDoubleProperty(" + name + ")"); } @@ -157,7 +152,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public float getFloatProperty(final String name) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getFloatProperty(" + name + ")"); } @@ -173,7 +168,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public int getIntProperty(final String name) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getIntProperty(" + name + ")"); } @@ -188,7 +183,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public String getJMSCorrelationID() throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getJMSCorrelationID()"); } @@ -203,7 +198,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public byte[] getJMSCorrelationIDAsBytes() throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getJMSCorrelationIDAsBytes()"); } @@ -218,7 +213,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public int getJMSDeliveryMode() throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getJMSDeliveryMode()"); } @@ -233,7 +228,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public Destination getJMSDestination() throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getJMSDestination()"); } @@ -248,7 +243,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public long getJMSExpiration() throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getJMSExpiration()"); } @@ -263,7 +258,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public String getJMSMessageID() throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getJMSMessageID()"); } @@ -278,7 +273,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public int getJMSPriority() throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getJMSPriority()"); } @@ -293,7 +288,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public boolean getJMSRedelivered() throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getJMSRedelivered()"); } @@ -308,7 +303,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public Destination getJMSReplyTo() throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getJMSReplyTo()"); } @@ -323,7 +318,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public long getJMSTimestamp() throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getJMSTimestamp()"); } @@ -338,7 +333,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public String getJMSType() throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getJMSType()"); } @@ -354,7 +349,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public long getLongProperty(final String name) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getLongProperty(" + name + ")"); } @@ -370,7 +365,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public Object getObjectProperty(final String name) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getObjectProperty(" + name + ")"); } @@ -385,7 +380,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public Enumeration getPropertyNames() throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getPropertyNames()"); } @@ -401,7 +396,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public short getShortProperty(final String name) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getShortProperty(" + name + ")"); } @@ -417,7 +412,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public String getStringProperty(final String name) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getStringProperty(" + name + ")"); } @@ -433,7 +428,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public boolean propertyExists(final String name) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("propertyExists(" + name + ")"); } @@ -449,7 +444,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void setBooleanProperty(final String name, final boolean value) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setBooleanProperty(" + name + ", " + value + ")"); } @@ -465,7 +460,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void setByteProperty(final String name, final byte value) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setByteProperty(" + name + ", " + value + ")"); } @@ -481,7 +476,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void setDoubleProperty(final String name, final double value) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setDoubleProperty(" + name + ", " + value + ")"); } @@ -497,7 +492,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void setFloatProperty(final String name, final float value) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setFloatProperty(" + name + ", " + value + ")"); } @@ -513,7 +508,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void setIntProperty(final String name, final int value) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setIntProperty(" + name + ", " + value + ")"); } @@ -528,7 +523,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void setJMSCorrelationID(final String correlationID) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setJMSCorrelationID(" + correlationID + ")"); } @@ -543,7 +538,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void setJMSCorrelationIDAsBytes(final byte[] correlationID) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setJMSCorrelationIDAsBytes(" + Arrays.toString(correlationID) + ")"); } @@ -558,7 +553,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void setJMSDeliveryMode(final int deliveryMode) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setJMSDeliveryMode(" + deliveryMode + ")"); } @@ -573,7 +568,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void setJMSDestination(final Destination destination) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setJMSDestination(" + destination + ")"); } @@ -588,7 +583,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void setJMSExpiration(final long expiration) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setJMSExpiration(" + expiration + ")"); } @@ -603,7 +598,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void setJMSMessageID(final String id) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setJMSMessageID(" + id + ")"); } @@ -618,7 +613,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void setJMSPriority(final int priority) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setJMSPriority(" + priority + ")"); } @@ -633,7 +628,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void setJMSRedelivered(final boolean redelivered) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setJMSRedelivered(" + redelivered + ")"); } @@ -648,7 +643,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void setJMSReplyTo(final Destination replyTo) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setJMSReplyTo(" + replyTo + ")"); } @@ -663,7 +658,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void setJMSTimestamp(final long timestamp) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setJMSTimestamp(" + timestamp + ")"); } @@ -678,7 +673,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void setJMSType(final String type) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setJMSType(" + type + ")"); } @@ -694,7 +689,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void setLongProperty(final String name, final long value) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setLongProperty(" + name + ", " + value + ")"); } @@ -710,7 +705,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void setObjectProperty(final String name, final Object value) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setObjectProperty(" + name + ", " + value + ")"); } @@ -726,7 +721,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void setShortProperty(final String name, final short value) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setShortProperty(" + name + ", " + value + ")"); } @@ -742,7 +737,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public void setStringProperty(final String name, final String value) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setStringProperty(" + name + ", " + value + ")"); } @@ -751,7 +746,7 @@ public class ActiveMQRAMessage implements Message { @Override public long getJMSDeliveryTime() throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getJMSDeliveryTime()"); } return message.getJMSDeliveryTime(); @@ -760,7 +755,7 @@ public class ActiveMQRAMessage implements Message { @Override public void setJMSDeliveryTime(long deliveryTime) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setJMSDeliveryTime(" + deliveryTime + ")"); } message.setJMSDeliveryTime(deliveryTime); @@ -768,7 +763,7 @@ public class ActiveMQRAMessage implements Message { @Override public <T> T getBody(Class<T> c) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getBody(" + c + ")"); } return message.getBody(c); @@ -776,7 +771,7 @@ public class ActiveMQRAMessage implements Message { @Override public boolean isBodyAssignableTo(Class c) throws JMSException { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("isBodyAssignableTo(" + c + ")"); } return message.isBodyAssignableTo(c); @@ -789,7 +784,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public int hashCode() { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("hashCode()"); } @@ -804,7 +799,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public boolean equals(final Object object) { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("equals(" + object + ")"); } @@ -822,7 +817,7 @@ public class ActiveMQRAMessage implements Message { */ @Override public String toString() { - if (ActiveMQRAMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("toString()"); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cbace51d/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageConsumer.java ---------------------------------------------------------------------- diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageConsumer.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageConsumer.java index 0e156aa..d4cafbf 100644 --- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageConsumer.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageConsumer.java @@ -32,11 +32,6 @@ import javax.jms.TextMessage; public class ActiveMQRAMessageConsumer implements MessageConsumer { /** - * Whether trace is enabled - */ - private static boolean trace = ActiveMQRALogger.LOGGER.isTraceEnabled(); - - /** * The wrapped message consumer */ protected MessageConsumer consumer; @@ -56,7 +51,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer { this.consumer = consumer; this.session = session; - if (ActiveMQRAMessageConsumer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("new ActiveMQMessageConsumer " + this + " consumer=" + consumer + @@ -72,7 +67,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer { */ @Override public void close() throws JMSException { - if (ActiveMQRAMessageConsumer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("close " + this); } try { @@ -88,7 +83,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer { * @throws JMSException Thrown if an error occurs */ void checkState() throws JMSException { - if (ActiveMQRAMessageConsumer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("checkState()"); } session.checkState(); @@ -102,7 +97,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer { */ @Override public MessageListener getMessageListener() throws JMSException { - if (ActiveMQRAMessageConsumer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getMessageListener()"); } @@ -141,7 +136,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer { */ @Override public String getMessageSelector() throws JMSException { - if (ActiveMQRAMessageConsumer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getMessageSelector()"); } @@ -159,14 +154,14 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer { public Message receive() throws JMSException { session.lock(); try { - if (ActiveMQRAMessageConsumer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("receive " + this); } checkState(); Message message = consumer.receive(); - if (ActiveMQRAMessageConsumer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("received " + this + " result=" + message); } @@ -191,14 +186,14 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer { public Message receive(final long timeout) throws JMSException { session.lock(); try { - if (ActiveMQRAMessageConsumer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("receive " + this + " timeout=" + timeout); } checkState(); Message message = consumer.receive(timeout); - if (ActiveMQRAMessageConsumer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("received " + this + " result=" + message); } @@ -222,14 +217,14 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer { public Message receiveNoWait() throws JMSException { session.lock(); try { - if (ActiveMQRAMessageConsumer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("receiveNoWait " + this); } checkState(); Message message = consumer.receiveNoWait(); - if (ActiveMQRAMessageConsumer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("received " + this + " result=" + message); } @@ -249,7 +244,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer { * @throws JMSException Thrown if an error occurs */ void closeConsumer() throws JMSException { - if (ActiveMQRAMessageConsumer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("closeConsumer()"); } @@ -263,7 +258,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer { * @return The wrapped message */ Message wrapMessage(final Message message) { - if (ActiveMQRAMessageConsumer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("wrapMessage(" + message + ")"); } @@ -288,7 +283,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer { * @return The wrapped listener */ MessageListener wrapMessageListener(final MessageListener listener) { - if (ActiveMQRAMessageConsumer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getMessageSelector()"); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cbace51d/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageListener.java ---------------------------------------------------------------------- diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageListener.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageListener.java index 8ad0736..1663938 100644 --- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageListener.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageListener.java @@ -25,11 +25,6 @@ import javax.jms.MessageListener; public class ActiveMQRAMessageListener implements MessageListener { /** - * Whether trace is enabled - */ - private static boolean trace = ActiveMQRALogger.LOGGER.isTraceEnabled(); - - /** * The message listener */ private final MessageListener listener; @@ -46,7 +41,7 @@ public class ActiveMQRAMessageListener implements MessageListener { * @param consumer the consumer */ public ActiveMQRAMessageListener(final MessageListener listener, final ActiveMQRAMessageConsumer consumer) { - if (ActiveMQRAMessageListener.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("constructor(" + listener + ", " + consumer + ")"); } @@ -61,7 +56,7 @@ public class ActiveMQRAMessageListener implements MessageListener { */ @Override public void onMessage(Message message) { - if (ActiveMQRAMessageListener.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("onMessage(" + message + ")"); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cbace51d/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageProducer.java ---------------------------------------------------------------------- diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageProducer.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageProducer.java index 447c824..12ece05 100644 --- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageProducer.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageProducer.java @@ -28,11 +28,6 @@ import javax.jms.MessageProducer; public class ActiveMQRAMessageProducer implements MessageProducer { /** - * Whether trace is enabled - */ - private static boolean trace = ActiveMQRALogger.LOGGER.isTraceEnabled(); - - /** * The wrapped message producer */ protected MessageProducer producer; @@ -52,7 +47,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { this.producer = producer; this.session = session; - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("new ActiveMQMessageProducer " + this + " producer=" + producer + @@ -68,7 +63,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { */ @Override public void close() throws JMSException { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("close " + this); } try { @@ -96,7 +91,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { final long timeToLive) throws JMSException { session.lock(); try { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("send " + this + " destination=" + destination + @@ -114,7 +109,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { producer.send(destination, message, deliveryMode, priority, timeToLive); - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("sent " + this + " result=" + message); } } finally { @@ -133,7 +128,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { public void send(final Destination destination, final Message message) throws JMSException { session.lock(); try { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("send " + this + " destination=" + destination + " message=" + message); } @@ -141,7 +136,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { producer.send(destination, message); - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("sent " + this + " result=" + message); } } finally { @@ -165,7 +160,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { final long timeToLive) throws JMSException { session.lock(); try { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("send " + this + " message=" + message + @@ -181,7 +176,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { producer.send(message, deliveryMode, priority, timeToLive); - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("sent " + this + " result=" + message); } } finally { @@ -199,7 +194,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { public void send(final Message message) throws JMSException { session.lock(); try { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("send " + this + " message=" + message); } @@ -207,7 +202,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { producer.send(message); - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("sent " + this + " result=" + message); } } finally { @@ -223,7 +218,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { */ @Override public int getDeliveryMode() throws JMSException { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getRoutingType()"); } @@ -238,7 +233,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { */ @Override public Destination getDestination() throws JMSException { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getDestination()"); } @@ -253,7 +248,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { */ @Override public boolean getDisableMessageID() throws JMSException { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getDisableMessageID()"); } @@ -268,7 +263,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { */ @Override public boolean getDisableMessageTimestamp() throws JMSException { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getDisableMessageTimestamp()"); } @@ -283,7 +278,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { */ @Override public int getPriority() throws JMSException { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getPriority()"); } @@ -298,7 +293,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { */ @Override public long getTimeToLive() throws JMSException { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getTimeToLive()"); } @@ -313,7 +308,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { */ @Override public void setDeliveryMode(final int deliveryMode) throws JMSException { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setRoutingType(" + deliveryMode + ")"); } @@ -328,7 +323,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { */ @Override public void setDisableMessageID(final boolean value) throws JMSException { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setDisableMessageID(" + value + ")"); } @@ -343,7 +338,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { */ @Override public void setDisableMessageTimestamp(final boolean value) throws JMSException { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setDisableMessageTimestamp(" + value + ")"); } @@ -358,7 +353,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { */ @Override public void setPriority(final int defaultPriority) throws JMSException { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setPriority(" + defaultPriority + ")"); } @@ -373,7 +368,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { */ @Override public void setTimeToLive(final long timeToLive) throws JMSException { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setTimeToLive(" + timeToLive + ")"); } @@ -382,7 +377,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { @Override public void setDeliveryDelay(long deliveryDelay) throws JMSException { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setDeliveryDelay(" + deliveryDelay + ")"); } producer.setDeliveryDelay(deliveryDelay); @@ -390,7 +385,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { @Override public long getDeliveryDelay() throws JMSException { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getDeliveryDelay()"); } return producer.getDeliveryDelay(); @@ -398,7 +393,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { @Override public void send(Message message, CompletionListener completionListener) throws JMSException { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("send(" + message + ", " + completionListener + ")"); } producer.send(message, completionListener); @@ -410,7 +405,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { int priority, long timeToLive, CompletionListener completionListener) throws JMSException { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("send(" + message + ", " + deliveryMode + ", " + priority + ", " + timeToLive + ", " + completionListener + ")"); } @@ -421,7 +416,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { public void send(Destination destination, Message message, CompletionListener completionListener) throws JMSException { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("send(" + destination + ", " + message + ", " + completionListener + ")"); } producer.send(destination, message, completionListener); @@ -434,7 +429,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer { int priority, long timeToLive, CompletionListener completionListener) throws JMSException { - if (ActiveMQRAMessageProducer.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("send(" + destination + ", " + message + ", " + deliveryMode + ", " + priority + ", " + timeToLive + ", " + completionListener + ")"); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cbace51d/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java ---------------------------------------------------------------------- diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java index 387b886..b0cf96a 100644 --- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java @@ -25,11 +25,6 @@ import javax.resource.spi.ManagedConnectionMetaData; public class ActiveMQRAMetaData implements ManagedConnectionMetaData { /** - * Trace enabled - */ - private static boolean trace = ActiveMQRALogger.LOGGER.isTraceEnabled(); - - /** * The managed connection */ private final ActiveMQRAManagedConnection mc; @@ -40,7 +35,7 @@ public class ActiveMQRAMetaData implements ManagedConnectionMetaData { * @param mc The managed connection */ public ActiveMQRAMetaData(final ActiveMQRAManagedConnection mc) { - if (ActiveMQRAMetaData.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("constructor(" + mc + ")"); } @@ -55,7 +50,7 @@ public class ActiveMQRAMetaData implements ManagedConnectionMetaData { */ @Override public String getEISProductName() throws ResourceException { - if (ActiveMQRAMetaData.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getEISProductName()"); } @@ -70,7 +65,7 @@ public class ActiveMQRAMetaData implements ManagedConnectionMetaData { */ @Override public String getEISProductVersion() throws ResourceException { - if (ActiveMQRAMetaData.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getEISProductVersion()"); } @@ -85,7 +80,7 @@ public class ActiveMQRAMetaData implements ManagedConnectionMetaData { */ @Override public String getUserName() throws ResourceException { - if (ActiveMQRAMetaData.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getUserName()"); } @@ -100,7 +95,7 @@ public class ActiveMQRAMetaData implements ManagedConnectionMetaData { */ @Override public int getMaxConnections() throws ResourceException { - if (ActiveMQRAMetaData.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getMaxConnections()"); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cbace51d/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAObjectMessage.java ---------------------------------------------------------------------- diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAObjectMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAObjectMessage.java index a01575c..d12baac 100644 --- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAObjectMessage.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAObjectMessage.java @@ -26,11 +26,6 @@ import java.io.Serializable; public class ActiveMQRAObjectMessage extends ActiveMQRAMessage implements ObjectMessage { /** - * 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 ActiveMQRAObjectMessage extends ActiveMQRAMessage implements Object public ActiveMQRAObjectMessage(final ObjectMessage message, final ActiveMQRASession session) { super(message, session); - if (ActiveMQRAObjectMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("constructor(" + message + ", " + session + ")"); } } @@ -52,7 +47,7 @@ public class ActiveMQRAObjectMessage extends ActiveMQRAMessage implements Object */ @Override public Serializable getObject() throws JMSException { - if (ActiveMQRAObjectMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getObject()"); } @@ -67,7 +62,7 @@ public class ActiveMQRAObjectMessage extends ActiveMQRAMessage implements Object */ @Override public void setObject(final Serializable object) throws JMSException { - if (ActiveMQRAObjectMessage.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setObject(" + object + ")"); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cbace51d/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAProperties.java ---------------------------------------------------------------------- diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAProperties.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAProperties.java index 10b281d..7543174 100644 --- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAProperties.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAProperties.java @@ -32,10 +32,7 @@ public class ActiveMQRAProperties extends ConnectionFactoryProperties implements * Serial version UID */ static final long serialVersionUID = -2772367477755473248L; - /** - * Trace enabled - */ - private static boolean trace = ActiveMQRALogger.LOGGER.isTraceEnabled(); + protected boolean allowLocalTransactions; protected boolean useTopologyForLoadBalancing = ActiveMQClient.DEFAULT_USE_TOPOLOGY_FOR_LOADBALANCING; @@ -87,7 +84,7 @@ public class ActiveMQRAProperties extends ConnectionFactoryProperties implements * Constructor */ public ActiveMQRAProperties() { - if (ActiveMQRAProperties.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("constructor()"); } } @@ -98,7 +95,7 @@ public class ActiveMQRAProperties extends ConnectionFactoryProperties implements * @return The value */ public String getUserName() { - if (ActiveMQRAProperties.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getUserName()"); } @@ -111,7 +108,7 @@ public class ActiveMQRAProperties extends ConnectionFactoryProperties implements * @param userName The value */ public void setUserName(final String userName) { - if (ActiveMQRAProperties.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setUserName(" + userName + ")"); } @@ -124,7 +121,7 @@ public class ActiveMQRAProperties extends ConnectionFactoryProperties implements * @return The value */ public String getPassword() { - if (ActiveMQRAProperties.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getPassword()"); } @@ -142,7 +139,7 @@ public class ActiveMQRAProperties extends ConnectionFactoryProperties implements * @param password The value */ public void setPassword(final String password) { - if (ActiveMQRAProperties.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setPassword(****)"); } @@ -180,7 +177,7 @@ public class ActiveMQRAProperties extends ConnectionFactoryProperties implements * @return The value */ public Boolean getUseLocalTx() { - if (ActiveMQRAProperties.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getUseLocalTx()"); } @@ -193,7 +190,7 @@ public class ActiveMQRAProperties extends ConnectionFactoryProperties implements * @param localTx The value */ public void setUseLocalTx(final Boolean localTx) { - if (ActiveMQRAProperties.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("setUseLocalTx(" + localTx + ")"); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cbace51d/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueReceiver.java ---------------------------------------------------------------------- diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueReceiver.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueReceiver.java index bfd8227..e3cbe82 100644 --- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueReceiver.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueReceiver.java @@ -26,11 +26,6 @@ import javax.jms.QueueReceiver; public class ActiveMQRAQueueReceiver extends ActiveMQRAMessageConsumer implements QueueReceiver { /** - * Whether trace is enabled - */ - private static boolean trace = ActiveMQRALogger.LOGGER.isTraceEnabled(); - - /** * Create a new wrapper * * @param consumer the queue receiver @@ -39,7 +34,7 @@ public class ActiveMQRAQueueReceiver extends ActiveMQRAMessageConsumer implement public ActiveMQRAQueueReceiver(final QueueReceiver consumer, final ActiveMQRASession session) { super(consumer, session); - if (ActiveMQRAQueueReceiver.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("constructor(" + consumer + ", " + session + ")"); } } @@ -52,7 +47,7 @@ public class ActiveMQRAQueueReceiver extends ActiveMQRAMessageConsumer implement */ @Override public Queue getQueue() throws JMSException { - if (ActiveMQRAQueueReceiver.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getQueue()"); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cbace51d/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueSender.java ---------------------------------------------------------------------- diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueSender.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueSender.java index 47a7acb..2753d3d 100644 --- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueSender.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueSender.java @@ -27,11 +27,6 @@ import javax.jms.QueueSender; public class ActiveMQRAQueueSender extends ActiveMQRAMessageProducer implements QueueSender { /** - * 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 ActiveMQRAQueueSender extends ActiveMQRAMessageProducer implements public ActiveMQRAQueueSender(final QueueSender producer, final ActiveMQRASession session) { super(producer, session); - if (ActiveMQRAQueueSender.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("constructor(" + producer + ", " + session + ")"); } } @@ -53,7 +48,7 @@ public class ActiveMQRAQueueSender extends ActiveMQRAMessageProducer implements */ @Override public Queue getQueue() throws JMSException { - if (ActiveMQRAQueueSender.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("getQueue()"); } @@ -78,7 +73,7 @@ public class ActiveMQRAQueueSender extends ActiveMQRAMessageProducer implements final long timeToLive) throws JMSException { session.lock(); try { - if (ActiveMQRAQueueSender.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("send " + this + " destination=" + destination + @@ -95,7 +90,7 @@ public class ActiveMQRAQueueSender extends ActiveMQRAMessageProducer implements checkState(); producer.send(destination, message, deliveryMode, priority, timeToLive); - if (ActiveMQRAQueueSender.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("sent " + this + " result=" + message); } } finally { @@ -114,14 +109,14 @@ public class ActiveMQRAQueueSender extends ActiveMQRAMessageProducer implements public void send(final Queue destination, final Message message) throws JMSException { session.lock(); try { - if (ActiveMQRAQueueSender.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("send " + this + " destination=" + destination + " message=" + message); } checkState(); producer.send(destination, message); - if (ActiveMQRAQueueSender.trace) { + if (ActiveMQRALogger.LOGGER.isTraceEnabled()) { ActiveMQRALogger.LOGGER.trace("sent " + this + " result=" + message); } } finally {
