diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-08-25 15:28:50 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-08-25 15:28:50 +0000 |
| commit | 9556a8d9c53be396a25cd4c29842b79e99bc1746 (patch) | |
| tree | bf6f92cfaee1883199c743bd25359841af3e7f1b /qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java | |
| parent | 19478e74524f27e26f01117b1b973829718ed44d (diff) | |
| download | qpid-python-9556a8d9c53be396a25cd4c29842b79e99bc1746.tar.gz | |
Merging from trunk r1618473:1618815 in the Java tree
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620348 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java')
| -rw-r--r-- | qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java index 95c53c8428..28d22a5a44 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java @@ -28,6 +28,7 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor; import org.apache.qpid.server.logging.EventLogger; @@ -155,7 +156,7 @@ public class StandardQueueEntryListTest extends QueueEntryListTestBase public void testScavenge() throws Exception { OrderedQueueEntryList sqel = new StandardQueueEntryList(null); - ConcurrentHashMap<Integer,QueueEntry> entriesMap = new ConcurrentHashMap<Integer,QueueEntry>(); + ConcurrentMap<Integer,QueueEntry> entriesMap = new ConcurrentHashMap<Integer,QueueEntry>(); //Add messages to generate QueueEntry's |