You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/10/29 09:34:23 UTC
[2/6] qpid-broker-j git commit: NO-JIRA: [Broker-J] Standardise the
name of the static LOGGER field across source code - no functional change
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java b/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java
index eac4b2e..87204c5 100644
--- a/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java
+++ b/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java
@@ -49,7 +49,7 @@ import org.apache.qpid.server.protocol.ErrorCodes;
*/
public class UnroutableMessageTestExceptionListener implements ExceptionListener
{
- private static final Logger _logger = LoggerFactory.getLogger(UnroutableMessageTestExceptionListener.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(UnroutableMessageTestExceptionListener.class);
/**
* Number of seconds to check for an event that should should NOT happen
@@ -66,7 +66,7 @@ public class UnroutableMessageTestExceptionListener implements ExceptionListener
@Override
public void onException(JMSException e)
{
- _logger.info("Received exception " + e);
+ LOGGER.info("Received exception " + e);
_exceptions.add(e);
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java b/systests/src/test/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
index ed48237..f6a85fb 100644
--- a/systests/src/test/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
@@ -64,7 +64,7 @@ import org.apache.qpid.transport.ExecutionErrorCode;
public class AddressBasedDestinationTest extends QpidBrokerTestCase
{
- private static final Logger _logger = LoggerFactory.getLogger(AddressBasedDestinationTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AddressBasedDestinationTest.class);
private Connection _connection;
@Override
@@ -578,7 +578,7 @@ public class AddressBasedDestinationTest extends QpidBrokerTestCase
{
if (!isCppBroker())
{
- _logger.info("Not C++ broker, exiting test");
+ LOGGER.info("Not C++ broker, exiting test");
return;
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/client/failover/FailoverTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/client/failover/FailoverTest.java b/systests/src/test/java/org/apache/qpid/test/client/failover/FailoverTest.java
index 32f62b6..ba0f4a8 100644
--- a/systests/src/test/java/org/apache/qpid/test/client/failover/FailoverTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/client/failover/FailoverTest.java
@@ -43,7 +43,7 @@ import org.apache.qpid.test.utils.FailoverBaseCase;
public class FailoverTest extends FailoverBaseCase
{
- private static final Logger _logger = LoggerFactory.getLogger(FailoverTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(FailoverTest.class);
private static final int DEFAULT_NUM_MESSAGES = 10;
private static final int DEFAULT_SEED = 20080921;
@@ -108,21 +108,21 @@ public class FailoverTest extends FailoverBaseCase
private void consumeMessages(int startIndex,int endIndex, boolean transacted) throws JMSException
{
Message msg;
- _logger.debug("**************** Receive (Start: " + startIndex + ", End:" + endIndex + ")***********************");
+ LOGGER.debug("**************** Receive (Start: " + startIndex + ", End:" + endIndex + ")***********************");
for (int i = startIndex; i < endIndex; i++)
{
msg = consumer.receive(1000);
assertNotNull("Message " + i + " was null!", msg);
- _logger.debug("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
- _logger.debug("Received : " + ((TextMessage) msg).getText());
- _logger.debug("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
+ LOGGER.debug("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
+ LOGGER.debug("Received : " + ((TextMessage) msg).getText());
+ LOGGER.debug("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
assertEquals("Invalid message order","message " + i, ((TextMessage) msg).getText());
}
- _logger.debug("***********************************************************");
+ LOGGER.debug("***********************************************************");
if (transacted)
{
@@ -132,18 +132,18 @@ public class FailoverTest extends FailoverBaseCase
private void sendMessages(int startIndex,int endIndex, boolean transacted) throws Exception
{
- _logger.debug("**************** Send (Start: " + startIndex + ", End:" + endIndex + ")***********************");
+ LOGGER.debug("**************** Send (Start: " + startIndex + ", End:" + endIndex + ")***********************");
for (int i = startIndex; i < endIndex; i++)
{
producer.send(producerSession.createTextMessage("message " + i));
- _logger.debug("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
- _logger.debug("Sending message"+i);
- _logger.debug("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
+ LOGGER.debug("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
+ LOGGER.debug("Sending message"+i);
+ LOGGER.debug("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
}
- _logger.debug("***********************************************************");
+ LOGGER.debug("***********************************************************");
if (transacted)
{
@@ -199,18 +199,18 @@ public class FailoverTest extends FailoverBaseCase
{
int toProduce = totalMessages;
- _logger.debug("===================================================================");
- _logger.debug("Total messages used for the test " + totalMessages + " messages");
- _logger.debug("===================================================================");
+ LOGGER.debug("===================================================================");
+ LOGGER.debug("Total messages used for the test " + totalMessages + " messages");
+ LOGGER.debug("===================================================================");
if (!produceAll)
{
toProduce = totalMessages - rand.nextInt(totalMessages);
}
- _logger.debug("==================");
- _logger.debug("Sending " + toProduce + " messages");
- _logger.debug("==================");
+ LOGGER.debug("==================");
+ LOGGER.debug("Sending " + toProduce + " messages");
+ LOGGER.debug("==================");
sendMessages(0, toProduce, transacted);
@@ -223,25 +223,25 @@ public class FailoverTest extends FailoverBaseCase
consumeMessages(0, toConsume, transacted);
- _logger.debug("==================");
- _logger.debug("Consuming " + toConsume + " messages");
- _logger.debug("==================");
+ LOGGER.debug("==================");
+ LOGGER.debug("Consuming " + toConsume + " messages");
+ LOGGER.debug("==================");
- _logger.info("Failing over");
+ LOGGER.info("Failing over");
causeFailure(broker, DEFAULT_FAILOVER_TIME);
// Check that you produce and consume the rest of messages.
- _logger.debug("==================");
- _logger.debug("Sending " + (totalMessages-toProduce) + " messages");
- _logger.debug("==================");
+ LOGGER.debug("==================");
+ LOGGER.debug("Sending " + (totalMessages-toProduce) + " messages");
+ LOGGER.debug("==================");
sendMessages(toProduce, totalMessages, transacted);
consumeMessages(toConsume, totalMessages, transacted);
- _logger.debug("==================");
- _logger.debug("Consuming " + (totalMessages-toConsume) + " messages");
- _logger.debug("==================");
+ LOGGER.debug("==================");
+ LOGGER.debug("Consuming " + (totalMessages-toConsume) + " messages");
+ LOGGER.debug("==================");
}
private void causeFailure(BrokerHolder broker, long delay)
@@ -249,7 +249,7 @@ public class FailoverTest extends FailoverBaseCase
failBroker(broker);
- _logger.info("Awaiting Failover completion");
+ LOGGER.info("Awaiting Failover completion");
try
{
if (!_failoverComplete.await(delay, TimeUnit.MILLISECONDS))
@@ -297,14 +297,14 @@ public class FailoverTest extends FailoverBaseCase
BrokerHolder currentBroker = getDefaultBroker();
int iterations = Integer.getInteger("profile.failoverIterations", 3);
- _logger.debug("LQ: iterations {}", iterations);
+ LOGGER.debug("LQ: iterations {}", iterations);
boolean useDefaultBroker = true;
init(false, Session.AUTO_ACKNOWLEDGE);
for (int i=0; i < iterations; i++)
{
- _logger.debug("===================================================================");
- _logger.debug("Failover In a loop : iteration number " + i);
- _logger.debug("===================================================================");
+ LOGGER.debug("===================================================================");
+ LOGGER.debug("Failover In a loop : iteration number " + i);
+ LOGGER.debug("===================================================================");
runP2PFailover(currentBroker, numMessages, false, false, false);
restartBroker(currentBroker);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/client/message/SelectorTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/client/message/SelectorTest.java b/systests/src/test/java/org/apache/qpid/test/client/message/SelectorTest.java
index 83e61f7..1c7571e 100644
--- a/systests/src/test/java/org/apache/qpid/test/client/message/SelectorTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/client/message/SelectorTest.java
@@ -44,7 +44,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class SelectorTest extends QpidBrokerTestCase implements MessageListener
{
- private static final Logger _logger = LoggerFactory.getLogger(SelectorTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(SelectorTest.class);
private Connection _connection;
private Queue _destination;
@@ -70,7 +70,7 @@ public class SelectorTest extends QpidBrokerTestCase implements MessageListener
public void onMessage(Message message)
{
count++;
- _logger.info("Got Message:" + message);
+ LOGGER.info("Got Message:" + message);
_responseLatch.countDown();
}
@@ -86,18 +86,18 @@ public class SelectorTest extends QpidBrokerTestCase implements MessageListener
msg.setStringProperty("foo", "wibble");
msg.setJMSType("Special");
- _logger.info("Sending Message:" + msg);
+ LOGGER.info("Sending Message:" + msg);
final MessageProducer producer = session.createProducer(_destination);
producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
producer.send(msg);
- _logger.info("Message sent, waiting for response...");
+ LOGGER.info("Message sent, waiting for response...");
_responseLatch.await(getReceiveTimeout(), TimeUnit.MILLISECONDS);
if (count > 0)
{
- _logger.info("Got message");
+ LOGGER.info("Got message");
}
if (count == 0)
@@ -120,7 +120,7 @@ public class SelectorTest extends QpidBrokerTestCase implements MessageListener
}
catch (JMSException e)
{
- _logger.debug("JMS:" + e.getClass().getSimpleName() + ":" + e.getMessage());
+ LOGGER.debug("JMS:" + e.getClass().getSimpleName() + ":" + e.getMessage());
if (!(e instanceof InvalidSelectorException))
{
fail("Wrong exception:" + e.getMessage());
@@ -137,7 +137,7 @@ public class SelectorTest extends QpidBrokerTestCase implements MessageListener
}
catch (JMSException e)
{
- _logger.debug("JMS:" + e.getClass().getSimpleName() + ":" + e.getMessage());
+ LOGGER.debug("JMS:" + e.getClass().getSimpleName() + ":" + e.getMessage());
if (!(e instanceof InvalidSelectorException))
{
fail("Wrong exception:" + e.getMessage());
@@ -154,7 +154,7 @@ public class SelectorTest extends QpidBrokerTestCase implements MessageListener
}
catch (JMSException e)
{
- _logger.debug("JMS:" + e.getClass().getSimpleName() + ":" + e.getMessage());
+ LOGGER.debug("JMS:" + e.getClass().getSimpleName() + ":" + e.getMessage());
if (!(e instanceof InvalidSelectorException))
{
fail("Wrong exception:" + e.getMessage());
@@ -170,7 +170,7 @@ public class SelectorTest extends QpidBrokerTestCase implements MessageListener
}
catch (JMSException e)
{
- _logger.debug("JMS:" + e.getClass().getSimpleName() + ":" + e.getMessage());
+ LOGGER.debug("JMS:" + e.getClass().getSimpleName() + ":" + e.getMessage());
if (!(e instanceof InvalidSelectorException))
{
fail("Wrong exception:" + e.getMessage());
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java b/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
index dea4fb6..5c2f800 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
@@ -28,6 +28,9 @@ import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.qpid.client.failover.FailoverException;
/**
@@ -36,6 +39,8 @@ import org.apache.qpid.client.failover.FailoverException;
*/
public class AcknowledgeOnMessageTest extends AcknowledgeTest implements MessageListener
{
+ private static final Logger LOGGER = LoggerFactory.getLogger(AcknowledgeOnMessageTest.class);
+
protected CountDownLatch _receivedAll;
protected AtomicReference<Exception> _causeOfFailure = new AtomicReference<Exception>(null);
@@ -124,12 +129,12 @@ public class AcknowledgeOnMessageTest extends AcknowledgeTest implements Message
Exception cause = _causeOfFailure.get();
if (cause != null)
{
- _logger.error("Cause of failure is: ", cause);
+ LOGGER.error("Cause of failure is: ", cause);
fail(cause.getMessage());
}
else
{
- _logger.info("AOMT: Check QueueDepth:" + _queue);
+ LOGGER.info("AOMT: Check QueueDepth:" + _queue);
long onQueue=getQueueDepth(_connection, _queue);
fail("All messages not received missing:" + _receivedAll.getCount() + "/" + NUM_MESSAGES+" On Queue:"+onQueue);
@@ -141,7 +146,7 @@ public class AcknowledgeOnMessageTest extends AcknowledgeTest implements Message
Exception cause = _causeOfFailure.get();
if (cause != null)
{
- _logger.error("Failed due to following exception", cause);
+ LOGGER.error("Failed due to following exception", cause);
fail(cause.getMessage());
}
@@ -161,7 +166,7 @@ public class AcknowledgeOnMessageTest extends AcknowledgeTest implements Message
_consumerSession.close();
- _logger.info("AOMT: check number of message at end of test.");
+ LOGGER.info("AOMT: check number of message at end of test.");
assertEquals("Wrong number of messages on queue", 0,
getQueueDepth(_connection, _queue));
}
@@ -182,7 +187,7 @@ public class AcknowledgeOnMessageTest extends AcknowledgeTest implements Message
public void onMessage(Message message)
{
// Log received Message for debugging
- _logger.info("RECEIVED MESSAGE:" + message);
+ LOGGER.info("RECEIVED MESSAGE:" + message);
try
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java b/systests/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
index 9950fbe..7af7b29 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
@@ -41,7 +41,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class RecoverTest extends QpidBrokerTestCase
{
- private static final Logger _logger = LoggerFactory.getLogger(RecoverTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(RecoverTest.class);
private static final int SENT_COUNT = 4;
@@ -70,9 +70,9 @@ public class RecoverTest extends QpidBrokerTestCase
_consumer = _consumerSession.createConsumer(queue);
- _logger.info("Sending four messages");
+ LOGGER.info("Sending four messages");
sendMessage(_connection.createSession(false, Session.AUTO_ACKNOWLEDGE), queue, SENT_COUNT);
- _logger.info("Starting connection");
+ LOGGER.info("Starting connection");
_connection.start();
}
@@ -103,17 +103,17 @@ public class RecoverTest extends QpidBrokerTestCase
if (message != null)
{
- _logger.info("Received redelivery of three messages. Acknowledging last message");
+ LOGGER.info("Received redelivery of three messages. Acknowledging last message");
message.acknowledge();
}
- _logger.info("Calling acknowledge with no outstanding messages");
+ LOGGER.info("Calling acknowledge with no outstanding messages");
// all acked so no messages to be delivered
_consumerSession.recover();
message = _consumer.receiveNoWait();
assertNull(message);
- _logger.info("No messages redelivered as is expected");
+ LOGGER.info("No messages redelivered as is expected");
}
public void testRecoverResendsMsgs() throws Exception
@@ -122,12 +122,12 @@ public class RecoverTest extends QpidBrokerTestCase
Message message = validateNextMessages(1, 0);
message.acknowledge();
- _logger.info("Received and acknowledged first message");
+ LOGGER.info("Received and acknowledged first message");
_consumer.receive();
_consumer.receive();
_consumer.receive();
- _logger.info("Received all four messages. Calling recover with three outstanding messages");
+ LOGGER.info("Received all four messages. Calling recover with three outstanding messages");
// no ack for last three messages so when I call recover I expect to get three messages back
_consumerSession.recover();
@@ -141,11 +141,11 @@ public class RecoverTest extends QpidBrokerTestCase
Message message = validateNextMessages(2, 0);
message.acknowledge();
- _logger.info("Received 2 messages, acknowledge() first message, should acknowledge both");
+ LOGGER.info("Received 2 messages, acknowledge() first message, should acknowledge both");
_consumer.receive();
_consumer.receive();
- _logger.info("Received all four messages. Calling recover with two outstanding messages");
+ LOGGER.info("Received all four messages. Calling recover with two outstanding messages");
// no ack for last three messages so when I call recover I expect to get three messages back
_consumerSession.recover();
@@ -157,10 +157,10 @@ public class RecoverTest extends QpidBrokerTestCase
assertNotNull(message3);
assertEquals(3, message3.getIntProperty(INDEX));
- _logger.info("Received redelivery of two messages. calling acknolwedgeThis() first of those message");
+ LOGGER.info("Received redelivery of two messages. calling acknolwedgeThis() first of those message");
((org.apache.qpid.jms.Message) message2).acknowledgeThis();
- _logger.info("Calling recover");
+ LOGGER.info("Calling recover");
// all acked so no messages to be delivered
_consumerSession.recover();
@@ -193,7 +193,7 @@ public class RecoverTest extends QpidBrokerTestCase
con2.close();
- _logger.info("Starting connection");
+ LOGGER.info("Starting connection");
con.start();
TextMessage tm2 = (TextMessage) consumer2.receive(_timeout);
@@ -250,13 +250,13 @@ public class RecoverTest extends QpidBrokerTestCase
}
else
{
- _logger.error(message.toString());
+ LOGGER.error(message.toString());
setError(new Exception("Message delivered too many times!: " + _count));
}
}
catch (JMSException e)
{
- _logger.error("Error recovering session: " + e, e);
+ LOGGER.error("Error recovering session: " + e, e);
setError(e);
}
@@ -342,7 +342,7 @@ public class RecoverTest extends QpidBrokerTestCase
//don't ack the message until we receive it 5 times
if( messageSeen < 5 )
{
- _logger.debug("Ignoring message " + actualIndex + " and calling recover");
+ LOGGER.debug("Ignoring message " + actualIndex + " and calling recover");
session.recover();
messageSeen++;
}
@@ -351,7 +351,7 @@ public class RecoverTest extends QpidBrokerTestCase
messageSeen = 0;
expectedIndex++;
message.acknowledge();
- _logger.debug("Acknowledging message " + actualIndex);
+ LOGGER.debug("Acknowledging message " + actualIndex);
}
}
}
@@ -391,7 +391,7 @@ public class RecoverTest extends QpidBrokerTestCase
//don't ack the message until we receive it 5 times
if( messageSeen < 5 )
{
- _logger.debug("Ignoring message " + actualIndex + " and calling recover");
+ LOGGER.debug("Ignoring message " + actualIndex + " and calling recover");
session.recover();
messageSeen++;
}
@@ -400,7 +400,7 @@ public class RecoverTest extends QpidBrokerTestCase
messageSeen = 0;
expectedIndex++;
message.acknowledge();
- _logger.debug("Acknowledging message " + actualIndex);
+ LOGGER.debug("Acknowledging message " + actualIndex);
if (expectedIndex == 8)
{
pass.set(true);
@@ -468,7 +468,7 @@ public class RecoverTest extends QpidBrokerTestCase
assertEquals("Unexpected message received", i, message.getIntProperty(INDEX));
}
- _logger.info("Recovering");
+ LOGGER.info("Recovering");
session.recover();
Message result = cons.receive(_timeout);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java b/systests/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
index d60a87f..aa3bd5e 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
@@ -44,7 +44,7 @@ import org.apache.qpid.transport.util.Waiter;
public class BytesMessageTest extends QpidBrokerTestCase implements MessageListener
{
- private static final Logger _logger = LoggerFactory.getLogger(BytesMessageTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(BytesMessageTest.class);
private Connection _connection;
private Destination _destination;
@@ -79,7 +79,7 @@ public class BytesMessageTest extends QpidBrokerTestCase implements MessageListe
send(_count);
waitFor(_count);
check();
- _logger.info("Completed without failure");
+ LOGGER.info("Completed without failure");
}
finally
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java b/systests/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
index 162c41d..e739a38 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
@@ -45,7 +45,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class FieldTableMessageTest extends QpidBrokerTestCase implements MessageListener
{
- private static final Logger _logger = LoggerFactory.getLogger(FieldTableMessageTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(FieldTableMessageTest.class);
private Connection _connection;
private Destination _destination;
@@ -95,7 +95,7 @@ public class FieldTableMessageTest extends QpidBrokerTestCase implements Message
send(count);
_waitForCompletion.await(20, TimeUnit.SECONDS);
check();
- _logger.info("Completed without failure");
+ LOGGER.info("Completed without failure");
_connection.close();
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java b/systests/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
index cc67263..acfeb4f 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
@@ -36,7 +36,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class LargeMessageTest extends QpidBrokerTestCase
{
- private static final Logger _logger = LoggerFactory.getLogger(LargeMessageTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(LargeMessageTest.class);
private Destination _destination;
private Session _session;
@@ -117,11 +117,11 @@ public class LargeMessageTest extends QpidBrokerTestCase
{
MessageConsumer consumer = _session.createConsumer(_destination);
MessageProducer producer = _session.createProducer(_destination);
- _logger.info("Testing message of size:" + messageSize);
+ LOGGER.info("Testing message of size:" + messageSize);
String _messageText = buildLargeMessage(messageSize);
- _logger.debug("Message built");
+ LOGGER.debug("Message built");
producer.send(_session.createTextMessage(_messageText));
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java b/systests/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
index ccfe66b..b8c636d 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
@@ -43,7 +43,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class MapMessageTest extends QpidBrokerTestCase implements MessageListener
{
- private static final Logger _logger = LoggerFactory.getLogger(MapMessageTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MapMessageTest.class);
private Connection _connection;
private Destination _destination;
@@ -78,7 +78,7 @@ public class MapMessageTest extends QpidBrokerTestCase implements MessageListene
@Override
protected void tearDown() throws Exception
{
- _logger.info("Tearing Down unit.basic.MapMessageTest");
+ LOGGER.info("Tearing Down unit.basic.MapMessageTest");
super.tearDown();
}
@@ -1231,7 +1231,7 @@ public class MapMessageTest extends QpidBrokerTestCase implements MessageListene
{
synchronized (received)
{
- _logger.info("****************** Recevied Messgage:" + message);
+ LOGGER.info("****************** Recevied Messgage:" + message);
received.add(message);
received.notify();
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java b/systests/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
index 0a4bb51..8e3dc67 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
@@ -35,7 +35,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class MultipleConnectionTest extends QpidBrokerTestCase
{
- private static final Logger _logger = LoggerFactory.getLogger(MultipleConnectionTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MultipleConnectionTest.class);
private class Receiver
@@ -186,7 +186,7 @@ public class MultipleConnectionTest extends QpidBrokerTestCase
try
{
waitForCompletion(messages, 5000, receivers);
- _logger.info("All receivers received all expected messages");
+ LOGGER.info("All receivers received all expected messages");
}
finally
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java b/systests/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
index 8233e76..ae185fa 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
@@ -42,7 +42,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class ObjectMessageTest extends QpidBrokerTestCase implements MessageListener
{
- private static final Logger _logger = LoggerFactory.getLogger(ObjectMessageTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ObjectMessageTest.class);
private Connection _connection;
private Destination _destination;
@@ -71,7 +71,7 @@ public class ObjectMessageTest extends QpidBrokerTestCase implements MessageList
send(count);
waitFor(count);
check();
- _logger.info("Completed without failure");
+ LOGGER.info("Completed without failure");
_connection.close();
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java b/systests/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
index 9dd4bff..50bb87e 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
@@ -51,7 +51,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class PropertyValueTest extends QpidBrokerTestCase implements MessageListener
{
- private static final Logger _logger = LoggerFactory.getLogger(PropertyValueTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PropertyValueTest.class);
private Connection _connection;
private Destination _destination;
@@ -314,14 +314,14 @@ public class PropertyValueTest extends QpidBrokerTestCase implements MessageList
int run = 0;
while (run < runSize)
{
- _logger.error("Run Number:" + run++);
+ LOGGER.error("Run Number:" + run++);
try
{
init(getConnection());
}
catch (Exception e)
{
- _logger.error("exception:", e);
+ LOGGER.error("exception:", e);
fail("Unable to initialise connection: " + e);
}
@@ -329,16 +329,16 @@ public class PropertyValueTest extends QpidBrokerTestCase implements MessageList
send(count, run);
waitFor(count);
check();
- _logger.info("Completed without failure");
+ LOGGER.info("Completed without failure");
_connection.close();
- _logger.error("End Run Number:" + (run - 1));
+ LOGGER.error("End Run Number:" + (run - 1));
}
}
catch (Exception e)
{
- _logger.error(e.getMessage(), e);
+ LOGGER.error(e.getMessage(), e);
}
}
@@ -381,7 +381,7 @@ public class PropertyValueTest extends QpidBrokerTestCase implements MessageList
m.setStringProperty("ReplyToIndex", String.valueOf(i));
_replyToDestinations.put(String.valueOf(i), q);
- _logger.debug("Message:" + m);
+ LOGGER.debug("Message:" + m);
m.setJMSType("Test");
m.setLongProperty("UnsignedInt", (long) 4294967295L);
@@ -390,7 +390,7 @@ public class PropertyValueTest extends QpidBrokerTestCase implements MessageList
m.setShortProperty("Short", (short) Short.MAX_VALUE);
m.setStringProperty("String", "Test");
- _logger.debug("Sending Msg:" + m);
+ LOGGER.debug("Sending Msg:" + m);
producer.send(m);
_session.commit();
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java b/systests/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
index 2fbff6d..91fa6cc 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
@@ -37,7 +37,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class SessionStartTest extends QpidBrokerTestCase implements MessageListener
{
- private static final Logger _logger = LoggerFactory.getLogger(SessionStartTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(SessionStartTest.class);
private Connection _connection;
private Destination _destination;
@@ -68,7 +68,7 @@ public class SessionStartTest extends QpidBrokerTestCase implements MessageListe
try
{
_session.createProducer(_destination).send(_session.createTextMessage("Message"));
- _logger.info("Message sent, waiting for response...");
+ LOGGER.info("Message sent, waiting for response...");
_countdownLatch.await(getReceiveTimeout(), TimeUnit.MILLISECONDS);
}
finally
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java b/systests/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
index aaa9e0a..9636b3f 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
@@ -45,7 +45,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class TextMessageTest extends QpidBrokerTestCase implements MessageListener
{
- private static final Logger _logger = LoggerFactory.getLogger(TextMessageTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(TextMessageTest.class);
private Connection _connection;
private Destination _destination;
@@ -94,7 +94,7 @@ public class TextMessageTest extends QpidBrokerTestCase implements MessageListen
}
catch (Throwable e)
{
- _logger.error("Error creating consumer", e);
+ LOGGER.error("Error creating consumer", e);
}
}
@@ -105,7 +105,7 @@ public class TextMessageTest extends QpidBrokerTestCase implements MessageListen
send(count);
_waitForCompletion.await(20, TimeUnit.SECONDS);
check();
- _logger.info("Completed without failure");
+ LOGGER.info("Completed without failure");
_connection.close();
}
@@ -120,10 +120,10 @@ public class TextMessageTest extends QpidBrokerTestCase implements MessageListen
Message m = _session.createTextMessage(text);
//m.setStringProperty("String", "hello");
- _logger.info("Sending Msg:" + m);
+ LOGGER.info("Sending Msg:" + m);
producer.send(m);
}
- _logger.info("sent " + count + " mesages");
+ LOGGER.info("sent " + count + " mesages");
}
@@ -227,7 +227,7 @@ public class TextMessageTest extends QpidBrokerTestCase implements MessageListen
{
synchronized (received)
{
- _logger.info("===== received one message");
+ LOGGER.info("===== received one message");
received.add(message);
_waitForCompletion.countDown();
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTest.java b/systests/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTest.java
index 3d854e0..2e766d4 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTest.java
@@ -33,7 +33,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class CloseTest extends QpidBrokerTestCase
{
- private static final Logger _logger = LoggerFactory.getLogger(CloseTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(CloseTest.class);
public void testCloseQueueReceiver() throws Exception
{
@@ -48,11 +48,11 @@ public class CloseTest extends QpidBrokerTestCase
connection.start();
- _logger.info("About to close consumer");
+ LOGGER.info("About to close consumer");
consumer.close();
- _logger.info("Closed Consumer");
+ LOGGER.info("Closed Consumer");
connection.close();
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java b/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
index d7f02b4..285224a 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
@@ -64,7 +64,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
*/
public class MaxDeliveryCountTest extends QpidBrokerTestCase
{
- private static final Logger _logger = LoggerFactory.getLogger(MaxDeliveryCountTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MaxDeliveryCountTest.class);
private boolean _failed;
private String _failMsg;
private static final int MSG_COUNT = 15;
@@ -295,7 +295,7 @@ public class MaxDeliveryCountTest extends QpidBrokerTestCase
Integer msgId = message.getIntProperty("count");
TextMessage txt = (TextMessage) message;
- _logger.info("Received message " + msgId + " at " + i + " from the DLQ: " + txt.getText());
+ LOGGER.info("Received message " + msgId + " at " + i + " from the DLQ: " + txt.getText());
assertTrue("message " + i + " was not one of those which should have been on the DLQ",
redeliverMsgs.contains(msgId));
@@ -356,7 +356,7 @@ public class MaxDeliveryCountTest extends QpidBrokerTestCase
{
int msgId = message.getIntProperty("count");
- _logger.info("Received message: " + msgId);
+ LOGGER.info("Received message: " + msgId);
//check the message is the one we expected
if(_expectedMessage != msgId)
@@ -401,7 +401,7 @@ public class MaxDeliveryCountTest extends QpidBrokerTestCase
_deliveryAttempts++; //increment count of times the current rolled back/recovered message(s) have been seen
- _logger.debug("ROLLBACK/RECOVER");
+ LOGGER.debug("ROLLBACK/RECOVER");
switch(deliveryMode)
{
case Session.SESSION_TRANSACTED:
@@ -427,7 +427,7 @@ public class MaxDeliveryCountTest extends QpidBrokerTestCase
//the message(s) should be redelivered, adjust expected message
_expectedMessage -= _numMsgsToBeRedelivered;
}
- _logger.debug("XXX _expectedMessage: " + _expectedMessage + " _deliveryAttempts : " + _deliveryAttempts + " _numMsgsToBeRedelivered=" + _numMsgsToBeRedelivered);
+ LOGGER.debug("XXX _expectedMessage: " + _expectedMessage + " _deliveryAttempts : " + _deliveryAttempts + " _numMsgsToBeRedelivered=" + _numMsgsToBeRedelivered);
//reset count of messages expected to be redelivered
_numMsgsToBeRedelivered = 0;
}
@@ -474,7 +474,7 @@ public class MaxDeliveryCountTest extends QpidBrokerTestCase
private void failAsyncTest(String msg)
{
- _logger.error("Failing test because: " + msg);
+ LOGGER.error("Failing test because: " + msg);
_failMsg = msg;
_failed = true;
_awaitCompletion.countDown();
@@ -513,7 +513,7 @@ public class MaxDeliveryCountTest extends QpidBrokerTestCase
{
int msgId = message.getIntProperty("count");
- _logger.info("Received message: " + msgId);
+ LOGGER.info("Received message: " + msgId);
//check the message is the one we expected
assertEquals("Unexpected message.", _expectedMessage, msgId);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java b/systests/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
index 593c7e1..c8273de 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
@@ -40,7 +40,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class ObjectMessageTest extends QpidBrokerTestCase implements MessageListener
{
- private static final Logger _logger = LoggerFactory.getLogger(ObjectMessageTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ObjectMessageTest.class);
private Connection connection;
private Destination destination;
@@ -92,11 +92,11 @@ public class ObjectMessageTest extends QpidBrokerTestCase implements MessageList
send();
waitUntilReceived(data.length);
check();
- _logger.info("All " + data.length + " items matched.");
+ LOGGER.info("All " + data.length + " items matched.");
}
catch (Exception e)
{
- _logger.error("This Test should succeed but failed", e);
+ LOGGER.error("This Test should succeed but failed", e);
fail("This Test should succeed but failed due to: " + e);
}
}
@@ -233,13 +233,13 @@ public class ObjectMessageTest extends QpidBrokerTestCase implements MessageList
}
else
{
- _logger.error("ERROR: Got " + message.getClass().getName() + " not ObjectMessage");
+ LOGGER.error("ERROR: Got " + message.getClass().getName() + " not ObjectMessage");
items.add(message);
}
}
catch (JMSException e)
{
- _logger.error("Error getting object from message", e);
+ LOGGER.error("Error getting object from message", e);
items.add(e);
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java b/systests/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
index df325e8..7282d41 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
@@ -27,8 +27,9 @@ import javax.jms.TopicPublisher;
import javax.jms.TopicSession;
import javax.jms.TopicSubscriber;
-import org.apache.qpid.client.AMQQueue;
-import org.apache.qpid.client.AMQSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.qpid.test.utils.QpidBrokerTestCase;
/**
@@ -37,6 +38,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
*/
public class DurableSubscriberTest extends QpidBrokerTestCase
{
+ private static final Logger LOGGER = LoggerFactory.getLogger(DurableSubscriberTest.class);
private final String _topicName = "durableSubscriberTopic";
/**
@@ -65,7 +67,7 @@ public class DurableSubscriberTest extends QpidBrokerTestCase
}
catch (Exception e)
{
- _logger.error("problems restarting broker: " + e);
+ LOGGER.error("problems restarting broker: " + e);
throw e;
}
TopicConnection pubConnection = (TopicConnection) getConnection();
@@ -119,7 +121,7 @@ public class DurableSubscriberTest extends QpidBrokerTestCase
{
if (! isBrokerStorePersistent())
{
- _logger.warn("Test skipped due to requirement of a persistent store");
+ LOGGER.warn("Test skipped due to requirement of a persistent store");
return;
}
@@ -152,7 +154,7 @@ public class DurableSubscriberTest extends QpidBrokerTestCase
}
catch (Exception e)
{
- _logger.error("problems restarting broker: " + e);
+ LOGGER.error("problems restarting broker: " + e);
throw e;
}
@@ -212,7 +214,7 @@ public class DurableSubscriberTest extends QpidBrokerTestCase
{
if (! isBrokerStorePersistent())
{
- _logger.warn("Test skipped due to requirement of a persistent store");
+ LOGGER.warn("Test skipped due to requirement of a persistent store");
return;
}
@@ -245,7 +247,7 @@ public class DurableSubscriberTest extends QpidBrokerTestCase
}
catch (Exception e)
{
- _logger.error("problems restarting broker: " + e);
+ LOGGER.error("problems restarting broker: " + e);
throw e;
}
@@ -292,7 +294,7 @@ public class DurableSubscriberTest extends QpidBrokerTestCase
{
if (! isBrokerStorePersistent())
{
- _logger.warn("Test skipped due to requirement of a persistent store");
+ LOGGER.warn("Test skipped due to requirement of a persistent store");
return;
}
@@ -375,7 +377,7 @@ public class DurableSubscriberTest extends QpidBrokerTestCase
}
catch (Exception e)
{
- _logger.error("problems restarting broker: " + e);
+ LOGGER.error("problems restarting broker: " + e);
throw e;
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java b/systests/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
index dbab40e..e59ada9 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
@@ -44,7 +44,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
*/
public class StreamMessageTest extends QpidBrokerTestCase
{
- private static final Logger _logger = LoggerFactory.getLogger(StreamMessageTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(StreamMessageTest.class);
public void testStreamMessageEOF() throws Exception
{
@@ -58,7 +58,7 @@ public class StreamMessageTest extends QpidBrokerTestCase
Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
// Need to start the "producer" connection in order to receive bounced messages
- _logger.info("Starting producer connection");
+ LOGGER.info("Starting producer connection");
con2.start();
MessageProducer mandatoryProducer = producerSession.createProducer(queue);
@@ -70,7 +70,7 @@ public class StreamMessageTest extends QpidBrokerTestCase
mandatoryProducer.send(msg);
- _logger.info("Starting consumer connection");
+ LOGGER.info("Starting consumer connection");
con.start();
StreamMessage msg2 = (StreamMessage) consumer.receive(2000);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java b/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
index be0a70e..8b34152 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
@@ -56,7 +56,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
*/
public class DurableSubscriptionTest extends QpidBrokerTestCase
{
- private static final Logger _logger = LoggerFactory.getLogger(DurableSubscriptionTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(DurableSubscriptionTest.class);
private static final String MY_TOPIC = "MyTopic";
@@ -66,22 +66,22 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase
{
TopicConnection con = (TopicConnection) getConnection();
Topic topic = createTopic(con, "MyDurableSubscriptionTestTopic");
- _logger.info("Create Session 1");
+ LOGGER.info("Create Session 1");
Session session1 = con.createSession(false, AMQSession.NO_ACKNOWLEDGE);
- _logger.info("Create Consumer on Session 1");
+ LOGGER.info("Create Consumer on Session 1");
MessageConsumer consumer1 = session1.createConsumer(topic);
- _logger.info("Create Producer on Session 1");
+ LOGGER.info("Create Producer on Session 1");
MessageProducer producer = session1.createProducer(topic);
- _logger.info("Create Session 2");
+ LOGGER.info("Create Session 2");
Session session2 = con.createSession(false, AMQSession.NO_ACKNOWLEDGE);
- _logger.info("Create Durable Subscriber on Session 2");
+ LOGGER.info("Create Durable Subscriber on Session 2");
TopicSubscriber consumer2 = session2.createDurableSubscriber(topic, MY_SUBSCRIPTION);
- _logger.info("Starting connection");
+ LOGGER.info("Starting connection");
con.start();
- _logger.info("Producer sending message A");
+ LOGGER.info("Producer sending message A");
producer.send(session1.createTextMessage("A"));
//check the dur sub's underlying queue now has msg count 1
@@ -89,27 +89,27 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase
assertEquals("Msg count should be 1", 1, ((AMQSession<?, ?>) session1).getQueueDepth(subQueue, true));
Message msg;
- _logger.info("Receive message on consumer 1:expecting A");
+ LOGGER.info("Receive message on consumer 1:expecting A");
msg = consumer1.receive(getReceiveTimeout());
assertNotNull("Message should have been received",msg);
assertEquals("A", ((TextMessage) msg).getText());
- _logger.info("Receive message on consumer 1 :expecting null");
+ LOGGER.info("Receive message on consumer 1 :expecting null");
msg = consumer1.receive(getShortReceiveTimeout());
assertEquals(null, msg);
- _logger.info("Receive message on consumer 2:expecting A");
+ LOGGER.info("Receive message on consumer 2:expecting A");
msg = consumer2.receive(getReceiveTimeout());
assertNotNull("Message should have been received",msg);
assertEquals("A", ((TextMessage) msg).getText());
msg = consumer2.receive(getShortReceiveTimeout());
- _logger.info("Receive message on consumer 1 :expecting null");
+ LOGGER.info("Receive message on consumer 1 :expecting null");
assertEquals(null, msg);
//check the dur sub's underlying queue now has msg count 0
assertEquals("Msg count should be 0", 0, ((AMQSession<?, ?>) session2).getQueueDepth(subQueue, true));
consumer2.close();
- _logger.info("Unsubscribe session2/consumer2");
+ LOGGER.info("Unsubscribe session2/consumer2");
session2.unsubscribe(MY_SUBSCRIPTION);
((AMQSession<?, ?>) session2).sync();
@@ -120,18 +120,18 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase
}
//verify unsubscribing the durable subscriber did not affect the non-durable one
- _logger.info("Producer sending message B");
+ LOGGER.info("Producer sending message B");
producer.send(session1.createTextMessage("B"));
- _logger.info("Receive message on consumer 1 :expecting B");
+ LOGGER.info("Receive message on consumer 1 :expecting B");
msg = consumer1.receive(getReceiveTimeout());
assertNotNull("Message should have been received",msg);
assertEquals("B", ((TextMessage) msg).getText());
- _logger.info("Receive message on consumer 1 :expecting null");
+ LOGGER.info("Receive message on consumer 1 :expecting null");
msg = consumer1.receive(getShortReceiveTimeout());
assertEquals(null, msg);
- _logger.info("Close connection");
+ LOGGER.info("Close connection");
con.close();
}
@@ -186,7 +186,7 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase
public void onException(JMSException exception)
{
_exception = exception;
- _logger.info("Exception listener received: " + exception);
+ LOGGER.info("Exception listener received: " + exception);
_latch.countDown();
}
@@ -216,7 +216,7 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase
{
if(!isBrokerStorePersistent())
{
- _logger.warn("The broker store is not persistent, skipping this test");
+ LOGGER.warn("The broker store is not persistent, skipping this test");
return;
}
@@ -252,14 +252,14 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase
producer.send(session1.createTextMessage("A"));
Message msg;
- _logger.info("Receive message on consumer 1 :expecting A");
+ LOGGER.info("Receive message on consumer 1 :expecting A");
msg = consumer1.receive(getReceiveTimeout());
assertNotNull("Message should have been received",msg);
assertEquals("A", ((TextMessage) msg).getText());
msg = consumer1.receive(getShortReceiveTimeout());
assertEquals(null, msg);
- _logger.info("Receive message on consumer 2 :expecting A");
+ LOGGER.info("Receive message on consumer 2 :expecting A");
msg = consumer2.receive(getReceiveTimeout());
assertNotNull("Message should have been received",msg);
assertEquals("A", ((TextMessage) msg).getText());
@@ -269,11 +269,11 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase
//send message B, receive with consumer 1, and disconnect consumer 2 to leave the message behind (if not NO_ACK)
producer.send(session1.createTextMessage("B"));
- _logger.info("Receive message on consumer 1 :expecting B");
+ LOGGER.info("Receive message on consumer 1 :expecting B");
msg = consumer1.receive(getReceiveTimeout());
assertNotNull("Consumer 1 should get message 'B'.", msg);
assertEquals("Incorrect Message received on consumer1.", "B", ((TextMessage) msg).getText());
- _logger.info("Receive message on consumer 1 :expecting null");
+ LOGGER.info("Receive message on consumer 1 :expecting null");
msg = consumer1.receive(getShortReceiveTimeout());
assertNull("There should be no more messages for consumption on consumer1.", msg);
@@ -294,25 +294,25 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase
}
else
{
- _logger.info("Receive message on consumer 3 :expecting B");
+ LOGGER.info("Receive message on consumer 3 :expecting B");
msg = consumer3.receive(getReceiveTimeout());
assertNotNull("Consumer 3 should get message 'B'.", msg);
assertEquals("Incorrect Message received on consumer3.", "B", ((TextMessage) msg).getText());
}
- _logger.info("Receive message on consumer 1 :expecting C");
+ LOGGER.info("Receive message on consumer 1 :expecting C");
msg = consumer1.receive(getReceiveTimeout());
assertNotNull("Consumer 1 should get message 'C'.", msg);
assertEquals("Incorrect Message received on consumer1.", "C", ((TextMessage) msg).getText());
- _logger.info("Receive message on consumer 1 :expecting null");
+ LOGGER.info("Receive message on consumer 1 :expecting null");
msg = consumer1.receive(getShortReceiveTimeout());
assertNull("There should be no more messages for consumption on consumer1.", msg);
- _logger.info("Receive message on consumer 3 :expecting C");
+ LOGGER.info("Receive message on consumer 3 :expecting C");
msg = consumer3.receive(getReceiveTimeout());
assertNotNull("Consumer 3 should get message 'C'.", msg);
assertEquals("Incorrect Message received on consumer3.", "C", ((TextMessage) msg).getText());
- _logger.info("Receive message on consumer 3 :expecting null");
+ LOGGER.info("Receive message on consumer 3 :expecting null");
msg = consumer3.receive(getShortReceiveTimeout());
assertNull("There should be no more messages for consumption on consumer3.", msg);
@@ -381,10 +381,10 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase
// Send message and receive on consumer 1.
producer.send(session0.createTextMessage("B"));
- _logger.info("Receive message on consumer 1 :expecting B");
+ LOGGER.info("Receive message on consumer 1 :expecting B");
msg = consumer1.receive(getReceiveTimeout());
assertEquals("B", ((TextMessage) msg).getText());
- _logger.info("Receive message on consumer 1 :expecting null");
+ LOGGER.info("Receive message on consumer 1 :expecting null");
msg = consumer1.receive(getShortReceiveTimeout());
assertEquals(null, msg);
@@ -396,10 +396,10 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase
// Send message C and receive on consumer 1
producer.send(session0.createTextMessage("C"));
- _logger.info("Receive message on consumer 1 :expecting C");
+ LOGGER.info("Receive message on consumer 1 :expecting C");
msg = consumer1.receive(getReceiveTimeout());
assertEquals("C", ((TextMessage) msg).getText());
- _logger.info("Receive message on consumer 1 :expecting null");
+ LOGGER.info("Receive message on consumer 1 :expecting null");
msg = consumer1.receive(getShortReceiveTimeout());
assertEquals(null, msg);
@@ -418,17 +418,17 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase
}
else
{
- _logger.info("Receive message on consumer 3 :expecting B");
+ LOGGER.info("Receive message on consumer 3 :expecting B");
msg = consumer3.receive(getReceiveTimeout());
assertNotNull(msg);
assertEquals("B", ((TextMessage) msg).getText());
}
- _logger.info("Receive message on consumer 3 :expecting C");
+ LOGGER.info("Receive message on consumer 3 :expecting C");
msg = consumer3.receive(getReceiveTimeout());
assertNotNull("Consumer 3 should get message 'C'.", msg);
assertEquals("Incorrect Message recevied on consumer3.", "C", ((TextMessage) msg).getText());
- _logger.info("Receive message on consumer 3 :expecting null");
+ LOGGER.info("Receive message on consumer 3 :expecting null");
msg = consumer3.receive(getShortReceiveTimeout());
assertNull("There should be no more messages for consumption on consumer3.", msg);
@@ -716,7 +716,7 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase
}
catch (Exception e)
{
- _logger.error("Receive error",e);
+ LOGGER.error("Receive error",e);
}
conn.stop();
@@ -784,7 +784,7 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase
}
catch (Exception e)
{
- _logger.error("Receive error",e);
+ LOGGER.error("Receive error",e);
}
conn.stop();
@@ -846,7 +846,7 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase
}
catch (Exception e)
{
- _logger.error("Error creating durable subscriber",e);
+ LOGGER.error("Error creating durable subscriber",e);
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java b/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
index 7b3d791..187a5be 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
@@ -33,13 +33,19 @@ import javax.jms.TopicPublisher;
import javax.jms.TopicSession;
import javax.jms.TopicSubscriber;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.qpid.client.AMQQueue;
import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.server.logging.ConsumerLoggingTest;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class TopicSessionTest extends QpidBrokerTestCase
{
+ private static final Logger LOGGER = LoggerFactory.getLogger(TopicSessionTest.class);
+
public void testTopicSubscriptionUnsubscription() throws Exception
{
@@ -293,7 +299,7 @@ public class TopicSessionTest extends QpidBrokerTestCase
m = (TextMessage) noLocal.receive(1000);
if (m != null)
{
- _logger.info("Message:" + m.getText());
+ LOGGER.info("Message:" + m.getText());
}
assertNull(m);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java b/systests/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
index c47cf52..c4eb3d5 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
@@ -61,7 +61,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
*/
public class CommitRollbackTest extends QpidBrokerTestCase
{
- private static final Logger _logger = LoggerFactory.getLogger(CommitRollbackTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(CommitRollbackTest.class);
private long _positiveTimeout;
private long _negativeTimeout;
@@ -82,7 +82,7 @@ public class CommitRollbackTest extends QpidBrokerTestCase
private void newConnection() throws Exception
{
- _logger.debug("calling newConnection()");
+ LOGGER.debug("calling newConnection()");
_conn = getConnection();
_session = _conn.createSession(true, Session.SESSION_TRANSACTED);
@@ -111,16 +111,16 @@ public class CommitRollbackTest extends QpidBrokerTestCase
assertTrue("session is not transacted", _session.getTransacted());
assertTrue("session is not transacted", _pubSession.getTransacted());
- _logger.info("sending test message");
+ LOGGER.info("sending test message");
String MESSAGE_TEXT = "testPutThenDisconnect";
_publisher.send(_pubSession.createTextMessage(MESSAGE_TEXT));
- _logger.info("reconnecting without commit");
+ LOGGER.info("reconnecting without commit");
_conn.close();
newConnection();
- _logger.info("receiving result");
+ LOGGER.info("receiving result");
Message result = _consumer.receive(_negativeTimeout);
// commit to ensure message is removed from queue
@@ -143,14 +143,14 @@ public class CommitRollbackTest extends QpidBrokerTestCase
assertTrue("session is not transacted", _session.getTransacted());
assertTrue("session is not transacted", _pubSession.getTransacted());
- _logger.info("sending test message");
+ LOGGER.info("sending test message");
String MESSAGE_TEXT = "testPutThenRollback";
_publisher.send(_pubSession.createTextMessage(MESSAGE_TEXT));
- _logger.info("rolling back");
+ LOGGER.info("rolling back");
_pubSession.rollback();
- _logger.info("receiving result");
+ LOGGER.info("receiving result");
Message result = _consumer.receive(_negativeTimeout);
assertNull("test message was put and rolled back, but is still present", result);
@@ -168,23 +168,23 @@ public class CommitRollbackTest extends QpidBrokerTestCase
assertTrue("session is not transacted", _session.getTransacted());
assertTrue("session is not transacted", _pubSession.getTransacted());
- _logger.info("sending test message");
+ LOGGER.info("sending test message");
String MESSAGE_TEXT = "testGetThenDisconnect";
_publisher.send(_pubSession.createTextMessage(MESSAGE_TEXT));
_pubSession.commit();
- _logger.info("getting test message");
+ LOGGER.info("getting test message");
Message msg = _consumer.receive(_positiveTimeout);
assertNotNull("retrieved message is null", msg);
- _logger.info("closing connection");
+ LOGGER.info("closing connection");
_conn.close();
newConnection();
- _logger.info("receiving result");
+ LOGGER.info("receiving result");
Message result = _consumer.receive(_negativeTimeout);
_session.commit();
@@ -206,25 +206,25 @@ public class CommitRollbackTest extends QpidBrokerTestCase
assertTrue("session is not transacted", _session.getTransacted());
assertTrue("session is not transacted", _pubSession.getTransacted());
- _logger.info("sending test message");
+ LOGGER.info("sending test message");
String MESSAGE_TEXT = "testGetThenCloseDisconnect";
_publisher.send(_pubSession.createTextMessage(MESSAGE_TEXT));
_pubSession.commit();
- _logger.info("getting test message");
+ LOGGER.info("getting test message");
Message msg = _consumer.receive(_positiveTimeout);
assertNotNull("retrieved message is null", msg);
assertEquals("test message was correct message", MESSAGE_TEXT, ((TextMessage) msg).getText());
- _logger.info("reconnecting without commit");
+ LOGGER.info("reconnecting without commit");
_consumer.close();
_conn.close();
newConnection();
- _logger.info("receiving result");
+ LOGGER.info("receiving result");
Message result = _consumer.receive(_positiveTimeout);
_session.commit();
@@ -246,24 +246,24 @@ public class CommitRollbackTest extends QpidBrokerTestCase
assertTrue("session is not transacted", _session.getTransacted());
assertTrue("session is not transacted", _pubSession.getTransacted());
- _logger.info("sending test message");
+ LOGGER.info("sending test message");
String MESSAGE_TEXT = "testGetThenRollback";
_publisher.send(_pubSession.createTextMessage(MESSAGE_TEXT));
_pubSession.commit();
- _logger.info("getting test message");
+ LOGGER.info("getting test message");
Message msg = _consumer.receive(_positiveTimeout);
assertNotNull("retrieved message is null", msg);
assertEquals("test message was correct message", MESSAGE_TEXT, ((TextMessage) msg).getText());
- _logger.info("rolling back");
+ LOGGER.info("rolling back");
_session.rollback();
- _logger.info("receiving result");
+ LOGGER.info("receiving result");
Message result = _consumer.receive(_positiveTimeout);
@@ -286,26 +286,26 @@ public class CommitRollbackTest extends QpidBrokerTestCase
assertTrue("session is not transacted", _session.getTransacted());
assertTrue("session is not transacted", _pubSession.getTransacted());
- _logger.info("sending test message");
+ LOGGER.info("sending test message");
String MESSAGE_TEXT = "testGetThenCloseRollback";
_publisher.send(_pubSession.createTextMessage(MESSAGE_TEXT));
_pubSession.commit();
- _logger.info("getting test message");
+ LOGGER.info("getting test message");
Message msg = _consumer.receive(_positiveTimeout);
assertNotNull("retrieved message is null", msg);
assertEquals("test message was correct message", MESSAGE_TEXT, ((TextMessage) msg).getText());
- _logger.info("Closing consumer");
+ LOGGER.info("Closing consumer");
_consumer.close();
- _logger.info("rolling back");
+ LOGGER.info("rolling back");
_session.rollback();
- _logger.info("receiving result");
+ LOGGER.info("receiving result");
_consumer = _session.createConsumer(_jmsQueue);
@@ -331,26 +331,26 @@ public class CommitRollbackTest extends QpidBrokerTestCase
assertTrue("session is not transacted", _session.getTransacted());
assertTrue("session is not transacted", _pubSession.getTransacted());
- _logger.info("sending two test messages");
+ LOGGER.info("sending two test messages");
_publisher.send(_pubSession.createTextMessage("1"));
_publisher.send(_pubSession.createTextMessage("2"));
_pubSession.commit();
- _logger.info("getting test message");
+ LOGGER.info("getting test message");
Message result = _consumer.receive(_positiveTimeout);
assertNotNull("Message received should not be null", result);
assertEquals("1", ((TextMessage) result).getText());
assertTrue("Message is marked as redelivered" + result, !result.getJMSRedelivered());
- _logger.info("Closing Consumer");
+ LOGGER.info("Closing Consumer");
_consumer.close();
- _logger.info("Creating New consumer");
+ LOGGER.info("Creating New consumer");
_consumer = _session.createConsumer(_jmsQueue);
- _logger.info("receiving result");
+ LOGGER.info("receiving result");
// Message 2 may be marked as redelivered if it was prefetched.
@@ -379,7 +379,7 @@ public class CommitRollbackTest extends QpidBrokerTestCase
assertTrue("session is not transacted", _session.getTransacted());
assertTrue("session is not transacted", _pubSession.getTransacted());
- _logger.info("sending test message");
+ LOGGER.info("sending test message");
String MESSAGE_TEXT = "testPutThenRollbackThenGet";
_publisher.send(_pubSession.createTextMessage(MESSAGE_TEXT));
@@ -389,10 +389,10 @@ public class CommitRollbackTest extends QpidBrokerTestCase
_publisher.send(_pubSession.createTextMessage(MESSAGE_TEXT));
- _logger.info("rolling back");
+ LOGGER.info("rolling back");
_pubSession.rollback();
- _logger.info("receiving result");
+ LOGGER.info("receiving result");
Message result = _consumer.receive(_negativeTimeout);
assertNull("test message was put and rolled back, but is still present", result);
@@ -426,7 +426,7 @@ public class CommitRollbackTest extends QpidBrokerTestCase
message.setJMSCorrelationID("m1");
prod.send(message);
_session.commit();
- _logger.info("Sent message to queue");
+ LOGGER.info("Sent message to queue");
CountDownLatch cd = new CountDownLatch(1);
cons.setMessageListener(new CommitWithinOnMessageListener(cd));
_conn.start();
@@ -490,10 +490,10 @@ public class CommitRollbackTest extends QpidBrokerTestCase
assertEquals("Unexpected message received", i, message.getIntProperty(INDEX));
}
- _logger.info("Rolling back");
+ LOGGER.info("Rolling back");
_session.rollback();
- _logger.info("Receiving messages");
+ LOGGER.info("Receiving messages");
Message result = _consumer.receive(_positiveTimeout);
assertNotNull("Message expected", result);
@@ -513,15 +513,15 @@ public class CommitRollbackTest extends QpidBrokerTestCase
{
try
{
- _logger.info("received message " + message);
+ LOGGER.info("received message " + message);
assertEquals("Wrong message received", message.getJMSCorrelationID(), "m1");
- _logger.info("commit session");
+ LOGGER.info("commit session");
_session.commit();
_cd.countDown();
}
catch (JMSException e)
{
- _logger.error("OnMessage error",e);
+ LOGGER.error("OnMessage error",e);
}
}
}
@@ -598,7 +598,7 @@ public class CommitRollbackTest extends QpidBrokerTestCase
try
{
combinedFuture.get(testTimeout, TimeUnit.MILLISECONDS);
- _logger.debug("Performed {} rollbacks, consumed {}/{} messages",
+ LOGGER.debug("Performed {} rollbacks, consumed {}/{} messages",
rollbackCounter.get(),
counter.get(),
numberOfMessages);
@@ -647,7 +647,7 @@ public class CommitRollbackTest extends QpidBrokerTestCase
assertTrue("session is not transacted", _session.getTransacted());
assertTrue("session is not transacted", _pubSession.getTransacted());
- _logger.info("sending test message");
+ LOGGER.info("sending test message");
String MESSAGE_TEXT = "message text";
_publisher.send(_pubSession.createTextMessage(MESSAGE_TEXT));
@@ -659,7 +659,7 @@ public class CommitRollbackTest extends QpidBrokerTestCase
_session.rollback();
- _logger.info("receiving result");
+ LOGGER.info("receiving result");
assertNotNull("two messages were sent, but none has been received", _consumer.receive(_positiveTimeout));
assertNotNull("two messages were sent, but only one has been received", _consumer.receive(_positiveTimeout));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org