QPID-327 : Patch supplied by Rob Godfrey - [race condition] PoolingFilter : Possible race condition when completing a Job

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

8 files changed, 30 insertions, 9 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java b/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
index 9d3c588fc8..10f5cd5667 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
@@ -106,6 +106,8 @@ public class TxAckTest extends TestCase
                 // TODO: fix hardcoded protocol version data
                 TestMessage message = new TestMessage(deliveryTag, i, new BasicPublishBody((byte)8,
                                                                                            (byte)0,
+                                                                                           BasicPublishBody.getClazz((byte)8,(byte)0),
+                                                                                           BasicPublishBody.getMethod((byte)8,(byte)0),
                                                                                            null,
                                                                                            false,
                                                                                            false,
diff --git a/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index 84506f4f48..a9d7299bec 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
@@ -153,7 +153,10 @@ public class AbstractHeadersExchangeTestBase extends TestCase
     {
         // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
         // TODO: Establish some way to determine the version for the test.
-        BasicPublishBody request = new BasicPublishBody((byte)8, (byte)0,null,false,false,new AMQShortString(id),0);
+        BasicPublishBody request = new BasicPublishBody((byte)8, (byte)0,
+                                                       BasicPublishBody.getClazz((byte)8,(byte)0),
+                                                       BasicPublishBody.getMethod((byte)8,(byte)0),
+                                                       null,false,false,new AMQShortString(id),0);
         
         return request;
     }
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java b/java/systests/src/main/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
index ba60105824..84dde9dd6f 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
@@ -169,6 +169,8 @@ public class AMQQueueMBeanTest extends TestCase
         // TODO: Establish some way to determine the version for the test.
         BasicPublishBody publish = new BasicPublishBody((byte)8,
                                                         (byte)0,
+                                                        BasicPublishBody.getClazz((byte)8,(byte)0),
+                                                        BasicPublishBody.getMethod((byte)8,(byte)0),
                                                         null,
                                                         immediate,
                                                         false,
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java b/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
index 2ec4eab74e..ccc7752fd3 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
@@ -99,6 +99,8 @@ public class AckTest extends TestCase
             // TODO: Establish some way to determine the version for the test.
             BasicPublishBody publishBody = new BasicPublishBody((byte)8,
                                                                 (byte)0,
+                                                                BasicPublishBody.getClazz((byte)8,(byte)0),
+                                                                BasicPublishBody.getMethod((byte)8,(byte)0),
                                                                 new AMQShortString("someExchange"),
                                                                 false,
                                                                 false,
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java b/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java
index 6c48bb2bf4..cf5baa77bd 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java
@@ -63,6 +63,8 @@ class MessageTestHelper extends TestCase
         // TODO: Establish some way to determine the version for the test.
         BasicPublishBody publish = new BasicPublishBody((byte)8,
                                                         (byte)0,
+                                                        BasicPublishBody.getClazz((byte)8,(byte)0),
+                                                        BasicPublishBody.getMethod((byte)8,(byte)0),
                                                         null,
                                                         immediate,
                                                         false,
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java b/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java
index 0cfa4eddce..0dd7744d1f 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java
@@ -24,6 +24,7 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQDataBlock;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.VersionSpecificRegistry;
 import org.apache.qpid.server.AMQChannel;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.protocol.AMQProtocolSession;
@@ -168,4 +169,9 @@ public class MockProtocolSession implements AMQProtocolSession
     {
         return 0;  //To change body of implemented methods use File | Settings | File Templates.
     }
+
+    public VersionSpecificRegistry getRegistry()
+    {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
 }
diff --git a/java/systests/src/main/java/org/apache/qpid/server/store/SkeletonMessageStore.java b/java/systests/src/main/java/org/apache/qpid/server/store/SkeletonMessageStore.java
index bf422742b5..42dd1a4b74 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/store/SkeletonMessageStore.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/store/SkeletonMessageStore.java
@@ -52,7 +52,7 @@ public class SkeletonMessageStore implements MessageStore
     {
     }
 
-    public void removeMessage(StoreContext s, long messageId)
+    public void removeMessage(StoreContext s, Long messageId)
     {
     }
 
@@ -82,27 +82,27 @@ public class SkeletonMessageStore implements MessageStore
         return null;
     }
 
-    public long getNewMessageId()
+    public Long getNewMessageId()
     {
         return _messageId.getAndIncrement();
     }
 
-    public void storeContentBodyChunk(StoreContext sc, long messageId, int index, ContentBody contentBody, boolean lastContentBody) throws AMQException
+    public void storeContentBodyChunk(StoreContext sc, Long messageId, int index, ContentBody contentBody, boolean lastContentBody) throws AMQException
     {
 
     }
 
-    public void storeMessageMetaData(StoreContext sc, long messageId, MessageMetaData messageMetaData) throws AMQException
+    public void storeMessageMetaData(StoreContext sc, Long messageId, MessageMetaData messageMetaData) throws AMQException
     {
 
     }
 
-    public MessageMetaData getMessageMetaData(long messageId) throws AMQException
+    public MessageMetaData getMessageMetaData(Long messageId) throws AMQException
     {
         return null;
     }
 
-    public ContentBody getContentBodyChunk(long messageId, int index) throws AMQException
+    public ContentBody getContentBodyChunk(Long messageId, int index) throws AMQException
     {
         return null;
     }
@@ -112,12 +112,12 @@ public class SkeletonMessageStore implements MessageStore
 
     }
 
-    public void enqueueMessage(StoreContext context, AMQShortString name, long messageId) throws AMQException
+    public void enqueueMessage(StoreContext context, AMQShortString name, Long messageId) throws AMQException
     {
 
     }
 
-    public void dequeueMessage(StoreContext context, AMQShortString name, long messageId) throws AMQException
+    public void dequeueMessage(StoreContext context, AMQShortString name, Long messageId) throws AMQException
     {
 
     }
diff --git a/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java b/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java
index e2500d9865..6eacd5168f 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java
@@ -53,6 +53,8 @@ public class TestReferenceCounting extends TestCase
         // TODO: fix hardcoded protocol version data
         AMQMessage message = new AMQMessage(_store.getNewMessageId(), new BasicPublishBody((byte)8,
                                                                                            (byte)0,
+                                                                                           BasicPublishBody.getClazz((byte)8,(byte)0),
+                                                                                           BasicPublishBody.getMethod((byte)8,(byte)0),
                                                                                            null,
                                                                                            false,
                                                                                            false,
@@ -82,6 +84,8 @@ public class TestReferenceCounting extends TestCase
         // TODO: fix hardcoded protocol version data
         AMQMessage message = new AMQMessage(_store.getNewMessageId(), new BasicPublishBody((byte)8,
                                                                                            (byte)0,
+                                                                                           BasicPublishBody.getClazz((byte)8,(byte)0),
+                                                                                           BasicPublishBody.getMethod((byte)8,(byte)0),
                                                                                            null,
                                                                                            false,
                                                                                            false,