Fixed outstanding merge issues and updates to trunk code that were required for sl4j.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@548753 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 4 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 5bd7b9aea0..47eff4be19 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,13 +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.slf4j.Logger;

+import org.slf4j.LoggerFactory;

+

 

 /**

  * Synchronous/Asynchronous puts. Asynchronous is easiest, just wait till can write to queue and deposit data.

@@ -44,7 +44,6 @@ public abstract class BatchSynchQueueBase<E> extends AbstractQueue<E> implements
 {

     /** Used for logging. */

     private static final Logger log = LoggerFactory.getLogger(BatchSynchQueueBase.class);

-                                                       

 

     /** Holds a reference to the queue implementation that holds the buffer. */

     Queue<SynchRecordImpl<E>> buffer;