summaryrefslogtreecommitdiff
path: root/qpid/java/common/src
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2007-06-15 16:37:08 +0000
committerMartin Ritchie <ritchiem@apache.org>2007-06-15 16:37:08 +0000
commit3769af8867386add4cbfa191ec45f786e4f84e69 (patch)
tree9aedcb0e25b3f3ec162b1bdb7a5ac28f67314e29 /qpid/java/common/src
parent1d23b9ec5e7296aecefe94a532a9f22dfb5fa5bb (diff)
downloadqpid-python-3769af8867386add4cbfa191ec45f786e4f84e69.tar.gz
Merged revisions 547178 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r547178 | gsim | 2007-06-14 09:51:39 +0100 (Thu, 14 Jun 2007) | 3 lines Converted templates to generate classes using slf4j rather than log4j inline with changes applied in rev 546190. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@547731 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common/src')
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java
index 08b5745b19..5bd7b9aea0 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java
@@ -1,11 +1,13 @@
package org.apache.qpid.util.concurrent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.log4j.Logger;
/**
* Synchronous/Asynchronous puts. Asynchronous is easiest, just wait till can write to queue and deposit data.
@@ -41,7 +43,8 @@ import org.apache.log4j.Logger;
public abstract class BatchSynchQueueBase<E> extends AbstractQueue<E> implements BatchSynchQueue<E>
{
/** Used for logging. */
- private static final Logger log = Logger.getLogger(BatchSynchQueueBase.class);
+ private static final Logger log = LoggerFactory.getLogger(BatchSynchQueueBase.class);
+
/** Holds a reference to the queue implementation that holds the buffer. */
Queue<SynchRecordImpl<E>> buffer;