You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2012/11/08 12:25:49 UTC

svn commit: r1407018 - in /activemq/trunk: activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.java activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala

Author: chirino
Date: Thu Nov  8 11:25:49 2012
New Revision: 1407018

URL: http://svn.apache.org/viewvc?rev=1407018&view=rev
Log:
Fixup failing LevelDB XA test.

Modified:
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.java
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.java?rev=1407018&r1=1407017&r2=1407018&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.java Thu Nov  8 11:25:49 2012
@@ -1,5 +1,6 @@
 package org.apache.activemq.leveldb;
 
+import junit.framework.Test;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.BrokerTest;
 import org.apache.activemq.store.PersistenceAdapter;
@@ -12,13 +13,13 @@ import java.io.IOException;
  */
 public class LevelDBStoreBrokerTest extends BrokerTest {
 
-//    def suite: Test = {
-//      return new TestSuite(classOf[LevelDBStoreBrokerTest])
-//    }
-//
-//    def main(args: Array[String]): Unit = {
-//      junit.textui.TestRunner.run(suite)
-//    }
+    public static Test suite() {
+        return suite(LevelDBStoreBrokerTest.class);
+    }
+
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
+    }
 
     @Override
     protected BrokerService createBroker() throws Exception {

Modified: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala?rev=1407018&r1=1407017&r2=1407018&view=diff
==============================================================================
--- activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala (original)
+++ activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala Thu Nov  8 11:25:49 2012
@@ -311,6 +311,7 @@ class LevelDBStore extends ServiceSuppor
           if( prepared ) {
             uow.dequeue(xacontainer_id, message.getMessageId)
           }
+          message.setMessageId(message.getMessageId.copy())
           store.doAdd(uow, message, delay)
         }