svn commit: r832528 - in /activemq/sandbox/activemq-apollo: activemq-broker/src/main/java/org/apache/activemq/apollo/broker/LocalTransaction.java activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSConsumerTest.java

[cmacnaug]

Author: cmacnaug
Date: Tue Nov  3 19:43:14 2009
New Revision: 832528

URL: http://svn.apache.org/viewvc?rev=832528&view=rev
Log:
Fixing a testcase hang in transaction commit, transaction commit listener wasn't being called.

Modified:
    activemq/sandbox/activemq-apollo/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/LocalTransaction.java
    activemq/sandbox/activemq-apollo/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSConsumerTest.java

Modified: activemq/sandbox/activemq-apollo/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/LocalTransaction.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/LocalTransaction.java?rev=832528&r1=832527&r2=832528&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/LocalTransaction.java (original)
+++ activemq/sandbox/activemq-apollo/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/LocalTransaction.java Tue Nov  3 19:43:14 2009
@@ -86,7 +86,7 @@
             {
                 public void onFutureComplete(Future<? extends Object> dbCommitResult) {
                     try {
-                        dbCommitResult.get();
+                        fireAfterCommit();
                         startTransactionProcessor();
                     } catch (InterruptedException e) {
                         //Shouldn't happen
@@ -117,7 +117,7 @@
     @Override
     public void rollback(TransactionListener listener) throws XAException, IOException {
         // TODO Auto-generated method stub
-
+        throw new UnsupportedOperationException("Not yet implemnted");
     }
 
     /* (non-Javadoc)

Modified: activemq/sandbox/activemq-apollo/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSConsumerTest.java?rev=832528&r1=832527&r2=832528&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSConsumerTest.java (original)
+++ activemq/sandbox/activemq-apollo/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSConsumerTest.java Tue Nov  3 19:43:14 2009
@@ -52,7 +52,7 @@
  * Test cases used to test the JMS message consumer.
  *
  */
-@Ignore // this test is now hanging.. this was passing at one point..
+// this test is now hanging.. this was passing at one point..
 public class JMSConsumerTest extends JmsTestSupport {
 
     private static final Log LOG = LogFactory.getLog(JMSConsumerTest.class);