[jboss-cvs] JBoss Messaging SVN: r2627 - in trunk: tests/src/org/jboss/test/messaging/jms and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2007-05-02 15:48:27 -0400 (Wed, 02 May 2007)
New Revision: 2627

Modified:
   trunk/src/main/org/jboss/jms/client/container/SessionAspect.java
   trunk/tests/src/org/jboss/test/messaging/jms/XATestBase.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-946 - just renaming a method to a better name

Modified: trunk/src/main/org/jboss/jms/client/container/SessionAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/SessionAspect.java	2007-05-02 18:24:41 UTC (rev 2626)
+++ trunk/src/main/org/jboss/jms/client/container/SessionAspect.java	2007-05-02 19:48:27 UTC (rev 2627)
@@ -69,6 +69,7 @@
  * This aspect is PER_VM
  *
  * @author <a href="mailto:tim.fox at jboss.com>Tim Fox</a>
+ * @author <a href="mailto:clebert.suconic at jboss.com>Clebert Suconic</a>
  * @author <a href="mailto:ovidiu at jboss.com>Ovidiu Feodorov</a>
  *
  * $Id$
@@ -98,7 +99,7 @@
       if (trace) { log.trace("handleClosing()"); }
 
       //Sanity check
-      if (state.isXA() && !isConsideredNonTransacted(state))
+      if (state.isXA() && !isXAAndConsideredNonTransacted(state))
       {
          if (trace) { log.trace("Session is XA"); }
          
@@ -128,7 +129,7 @@
       //any deliveries - this is because the message listener might have closed
       //before on message had finished executing
       
-      if (ackMode == Session.AUTO_ACKNOWLEDGE || isConsideredNonTransacted(state))
+      if (ackMode == Session.AUTO_ACKNOWLEDGE || isXAAndConsideredNonTransacted(state))
       {
          //Acknowledge or cancel any outstanding auto ack
          
@@ -250,7 +251,7 @@
       }
       // if XA and there is no transaction enlisted on XA we will act as AutoAcknowledge
       // However if it's a MDB (if there is a DistinguishedListener) we should behaved as transacted
-      else if (ackMode == Session.AUTO_ACKNOWLEDGE || isConsideredNonTransacted(state))
+      else if (ackMode == Session.AUTO_ACKNOWLEDGE || isXAAndConsideredNonTransacted(state))
       {
          // We collect the single acknowledgement in the state. 
                            
@@ -307,7 +308,7 @@
 
       // if XA and there is no transaction enlisted on XA we will act as AutoAcknowledge
       // However if it's a MDB (if there is a DistinguishedListener) we should behaved as transacted
-      if (ackMode == Session.AUTO_ACKNOWLEDGE || isConsideredNonTransacted(state))
+      if (ackMode == Session.AUTO_ACKNOWLEDGE || isXAAndConsideredNonTransacted(state))
       {
          // We auto acknowledge.
 
@@ -420,7 +421,7 @@
             
       SessionState state = getState(invocation);
       
-      if (state.isTransacted() && !isConsideredNonTransacted(state))
+      if (state.isTransacted() && !isXAAndConsideredNonTransacted(state))
       {
          throw new IllegalStateException("Cannot recover a transacted session");
       }
@@ -442,7 +443,7 @@
 
          state.setRecoverCalled(true);
       }
-      else if (ackMode == Session.AUTO_ACKNOWLEDGE || ackMode == Session.DUPS_OK_ACKNOWLEDGE || isConsideredNonTransacted(state))
+      else if (ackMode == Session.AUTO_ACKNOWLEDGE || ackMode == Session.DUPS_OK_ACKNOWLEDGE || isXAAndConsideredNonTransacted(state))
       {
          DeliveryInfo info = state.getAutoAckInfo();
          
@@ -883,7 +884,7 @@
     *    we will convert LocalTX to GlobalTransactions.
     *    This function helper will ensure the condition that needs to be tested on this aspect
     * */
-   private boolean isConsideredNonTransacted(SessionState state)
+   private boolean isXAAndConsideredNonTransacted(SessionState state)
    {
       return state.isXA() && (state.getCurrentTxId() instanceof LocalTx) && (state.getDistinguishedListener() == null);
    }

Modified: trunk/tests/src/org/jboss/test/messaging/jms/XATestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/XATestBase.java	2007-05-02 18:24:41 UTC (rev 2626)
+++ trunk/tests/src/org/jboss/test/messaging/jms/XATestBase.java	2007-05-02 19:48:27 UTC (rev 2627)
@@ -74,6 +74,7 @@
  * A XATestBase
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
  * @version <tt>$Revision: 1.1 $</tt>
  *
  * $Id$