[rhmessaging-commits] rhmessaging commits: r1709 - in store/branches/java/M2.1/java/bdbstore/src: test/java/org/apache/qpid/server/store/berkeleydb and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: godfrer
Date: 2008-02-20 05:19:32 -0500 (Wed, 20 Feb 2008)
New Revision: 1709

Modified:
   store/branches/java/M2.1/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
   store/branches/java/M2.1/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/MessageMetaDataTupleBinding.java
   store/branches/java/M2.1/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreTest.java
Log:
Fixed compilation issues against Apache M2.1 codebase

Modified: store/branches/java/M2.1/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
===================================================================
--- store/branches/java/M2.1/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java	2008-02-20 04:38:03 UTC (rev 1708)
+++ store/branches/java/M2.1/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java	2008-02-20 10:19:32 UTC (rev 1709)
@@ -1243,7 +1243,7 @@
 
         public void process() throws AMQException
         {
-            _queue.process(_context, _message, false);
+            _queue.process(_context, _queue.createEntry(_message), false);
         }
 
     }

Modified: store/branches/java/M2.1/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/MessageMetaDataTupleBinding.java
===================================================================
--- store/branches/java/M2.1/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/MessageMetaDataTupleBinding.java	2008-02-20 04:38:03 UTC (rev 1708)
+++ store/branches/java/M2.1/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/MessageMetaDataTupleBinding.java	2008-02-20 10:19:32 UTC (rev 1709)
@@ -84,6 +84,11 @@
                 return exchange;
             }
 
+            public void setExchange(AMQShortString exchange)
+            {
+
+            }
+
             public boolean isImmediate()
             {
                 return immediate;

Modified: store/branches/java/M2.1/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreTest.java
===================================================================
--- store/branches/java/M2.1/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreTest.java	2008-02-20 04:38:03 UTC (rev 1708)
+++ store/branches/java/M2.1/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreTest.java	2008-02-20 10:19:32 UTC (rev 1709)
@@ -115,6 +115,11 @@
                 return MYEXCHANGE;
             }
 
+            public void setExchange(AMQShortString exchange)
+            {
+
+            }
+
             public boolean isImmediate()
             {
                 return false;
@@ -169,10 +174,9 @@
 
     private ContentHeaderBody createContentHeaderBody(BasicContentHeaderProperties props, int length)
     {
-        // TODO: fix hardcoded 8,0
-        return new ContentHeaderBody(BasicConsumeBody.getClazz((byte) 8,
-                                                               (byte) 0), 1,
-                                                                          props, length);
+        MethodRegistry methodRegistry = MethodRegistry.getMethodRegistry(ProtocolVersion.v8_0);
+        int classForBasic = methodRegistry.createBasicQosOkBody().getClazz();
+        return new ContentHeaderBody(classForBasic, 1, props, length);
     }
 
     public void testMessagePersistence() throws DatabaseException, AMQException