[jboss-cvs] jboss-jms/src/main/org/jboss/jms/tx ...

[Timothy Fox]

  User: timfox  
  Date: 06/07/27 15:01:55

  Modified:    src/main/org/jboss/jms/tx   ResourceManager.java
                        TxState.java
  Log:
  Mainly http://jira.jboss.com/jira/browse/JBMESSAGING-434 plus a few other bits and pieces
  
  Revision  Changes    Path
  1.23      +11 -3     jboss-jms/src/main/org/jboss/jms/tx/ResourceManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ResourceManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/jms/tx/ResourceManager.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- ResourceManager.java	20 Jul 2006 14:04:02 -0000	1.22
  +++ ResourceManager.java	27 Jul 2006 19:01:55 -0000	1.23
  @@ -55,9 +55,9 @@
    *
    * @author <a href="mailto:Cojonudo14 at hotmail.com">Hiram Chirino</a>
    * @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
  - * @version $Revision: 1.22 $
  + * @version $Revision: 1.23 $
    *
  - * $Id: ResourceManager.java,v 1.22 2006/07/20 14:04:02 timfox Exp $
  + * $Id: ResourceManager.java,v 1.23 2006/07/27 19:01:55 timfox Exp $
    */
   public class ResourceManager
   {
  @@ -458,7 +458,15 @@
         
         if (flags == XAResource.TMSTARTRSCAN)
         {
  -         return conn.getPreparedTransactions();
  +         try
  +         {
  +            Xid[] txs = conn.getPreparedTransactions();
  +            return txs;
  +         }
  +         catch (JMSException e)
  +         {
  +            throw new MessagingXAException(XAException.XAER_RMFAIL, "Failed to get prepared transactions");
  +         }
         }
         else
         {
  
  
  
  1.10      +0 -3      jboss-jms/src/main/org/jboss/jms/tx/TxState.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TxState.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/jms/tx/TxState.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- TxState.java	17 Jul 2006 17:14:47 -0000	1.9
  +++ TxState.java	27 Jul 2006 19:01:55 -0000	1.10
  @@ -26,12 +26,9 @@
   import java.io.ObjectInput;
   import java.io.ObjectOutput;
   import java.util.ArrayList;
  -import java.util.HashSet;
   import java.util.Iterator;
   import java.util.List;
  -import java.util.Set;
   
  -import org.jboss.jms.client.state.SessionState;
   import org.jboss.jms.message.JBossMessage;
   import org.jboss.messaging.core.message.MessageFactory;