2 files changed, 7 insertions, 7 deletions
diff --git a/java/common/src/main/java/org/apache/qpid/framing/RequestManager.java b/java/common/src/main/java/org/apache/qpid/framing/RequestManager.java
index be3ba5a344..a3379484bd 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/RequestManager.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/RequestManager.java
@@ -20,7 +20,7 @@
  */
 package org.apache.qpid.framing;
 
-import java.util.Hashtable;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.qpid.protocol.AMQMethodEvent;
 import org.apache.qpid.protocol.AMQMethodListener;
@@ -43,7 +43,7 @@ public class RequestManager
      */
     private long lastProcessedResponseId;
 
-    private Hashtable<Long, AMQMethodListener> requestSentMap;
+    private ConcurrentHashMap<Long, AMQMethodListener> requestSentMap;
 
     public RequestManager(int channel, AMQProtocolWriter protocolWriter)
     {
@@ -51,7 +51,7 @@ public class RequestManager
         this.protocolWriter = protocolWriter;
         requestIdCount = 1L;
         lastProcessedResponseId = 0L;
-        requestSentMap = new Hashtable<Long, AMQMethodListener>();
+        requestSentMap = new ConcurrentHashMap<Long, AMQMethodListener>();
     }
 
     // *** Functions to originate a request ***
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ResponseManager.java b/java/common/src/main/java/org/apache/qpid/framing/ResponseManager.java
index 15193637bc..43c6de74c5 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ResponseManager.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ResponseManager.java
@@ -21,7 +21,7 @@
 package org.apache.qpid.framing;
 
 import java.util.Iterator;
-import java.util.Hashtable;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.qpid.AMQException;
 import org.apache.qpid.protocol.AMQMethodEvent;
@@ -88,7 +88,7 @@ public class ResponseManager
         }
     }
 
-    private Hashtable<Long, ResponseStatus> responseMap;
+    private ConcurrentHashMap<Long, ResponseStatus> responseMap;
 
     public ResponseManager(int channel, AMQMethodListener methodListener,
         AMQProtocolWriter protocolWriter)
@@ -98,7 +98,7 @@ public class ResponseManager
         this.protocolWriter = protocolWriter;
         responseIdCount = 1L;
         lastReceivedRequestId = 0L;
-        responseMap = new Hashtable<Long, ResponseStatus>();
+        responseMap = new ConcurrentHashMap<Long, ResponseStatus>();
     }
 
     // *** Functions to handle an incoming request ***
@@ -193,7 +193,7 @@ public class ResponseManager
         return responseIdCount++;
     }
 
-    private void doBatches()
+    private synchronized void doBatches()
     {
         switch (batchResponseMode)
         {