summaryrefslogtreecommitdiff
path: root/qpid/java/common/src
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2015-03-12 16:13:26 +0000
committerRobert Godfrey <rgodfrey@apache.org>2015-03-12 16:13:26 +0000
commit679888eb0d0dd80e21f5c63de83037a19d3b6c5b (patch)
tree8891ebeac88e20c280baf859cb92f2b748c32312 /qpid/java/common/src
parent6e98063ae07795f988ad26fdcf49d204d88b39c3 (diff)
downloadqpid-python-679888eb0d0dd80e21f5c63de83037a19d3b6c5b.tar.gz
QPID-2836 : [Java Broker] Use slf4j facade for logging in the Java Broker
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1666234 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common/src')
-rw-r--r--qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java7
-rw-r--r--qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java5
2 files changed, 7 insertions, 5 deletions
diff --git a/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
index afc2b968f4..3a6006c338 100644
--- a/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
@@ -31,7 +31,8 @@ import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.transport.network.ConnectionBinding;
@@ -43,7 +44,7 @@ import org.apache.qpid.transport.util.Waiter;
*/
public class ConnectionTest extends QpidTestCase implements SessionListener
{
- private static final Logger _logger = Logger.getLogger(ConnectionTest.class);
+ private static final Logger _logger = LoggerFactory.getLogger(ConnectionTest.class);
private int port;
private volatile boolean queue = false;
private List<MessageTransfer> messages = new ArrayList<MessageTransfer>();
@@ -358,7 +359,7 @@ public class ConnectionTest extends QpidTestCase implements SessionListener
ssn.sync();
if (_logger.isDebugEnabled())
{
- _logger.debug(messages);
+ _logger.debug(String.valueOf(messages));
}
assertEquals(1, messages.size());
assertEquals("SINK 3", messages.get(0).getBodyString());
diff --git a/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java
index 67d360fa9e..f1492273c8 100644
--- a/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java
@@ -26,7 +26,8 @@ import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketAddress;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.qpid.transport.Binding;
@@ -38,7 +39,7 @@ import org.apache.qpid.transport.Binding;
public class IoAcceptor<E> extends Thread
{
- private static final Logger _logger = Logger.getLogger(IoAcceptor.class);
+ private static final Logger _logger = LoggerFactory.getLogger(IoAcceptor.class);
private volatile boolean _closed = false;