From 89238b6c323ec9d5164fe630ac66b4b5ab2cfdcd Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Tue, 19 Jun 2007 14:53:29 +0000 Subject: 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/qpid@548753 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'java/common/src') diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java b/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java index 5bd7b9aea0..47eff4be19 100644 --- a/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java +++ b/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 extends AbstractQueue 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> buffer; -- cgit v1.2.1