[jmscts-cvs] jmscts/src/java/org/exolab/jmscts/core EchoListener.java, 1.3, 1.4 MessagingHelper.java, 1.4, 1.5 SendReceiveTestInvoker.java, 1.5, 1.6

[DonH <do...@us...>]

Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/core
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16979/core

Modified Files:
	EchoListener.java MessagingHelper.java 
	SendReceiveTestInvoker.java 
Log Message:
add check before commit to not do commit for an XASession

Index: SendReceiveTestInvoker.java
===================================================================
RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/core/SendReceiveTestInvoker.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SendReceiveTestInvoker.java	16 Jun 2005 08:10:52 -0000	1.5
--- SendReceiveTestInvoker.java	19 Sep 2006 19:55:12 -0000	1.6
***************
*** 193,197 ****
          if (!context.isInvalid()) {
              try {
!                 if (session.getTransacted()) {
                      // flush any messages to help ensure that destroying the
                      // destination doesn't cause too many problems
--- 193,197 ----
          if (!context.isInvalid()) {
              try {
! 		if (!(session instanceof javax.jms.XASession) && session.getTransacted()) {
                      // flush any messages to help ensure that destroying the
                      // destination doesn't cause too many problems

Index: EchoListener.java
===================================================================
RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/core/EchoListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EchoListener.java	31 Jan 2004 13:44:24 -0000	1.3
--- EchoListener.java	19 Sep 2006 19:55:12 -0000	1.4
***************
*** 126,130 ****
              _sender.send(message, _count);
              if (_commit) {
!                 if (_session != null && _session.getTransacted()) {
                      _session.commit();
                  }
--- 126,130 ----
              _sender.send(message, _count);
              if (_commit) {
!                 if (_session != null && !(_session instanceof javax.jms.XASession) && _session.getTransacted()) {
                      _session.commit();
                  }

Index: MessagingHelper.java
===================================================================
RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/core/MessagingHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MessagingHelper.java	31 Jan 2004 13:44:24 -0000	1.4
--- MessagingHelper.java	19 Sep 2006 19:55:12 -0000	1.5
***************
*** 192,196 ****
              sender.send(message, 1);
              Session session = context.getSession();
!             if (session.getTransacted()) {
                  session.commit();
              }
--- 192,196 ----
              sender.send(message, 1);
              Session session = context.getSession();
!             if (!(session instanceof javax.jms.XASession) && session.getTransacted()) {
                  session.commit();
              }
***************
*** 207,211 ****
                                      + " but got " + messages.size());
              }
!             if (session.getTransacted()) {
                  session.commit();
              }
--- 207,211 ----
                                      + " but got " + messages.size());
              }
!             if (!(session instanceof javax.jms.XASession) && session.getTransacted()) {
                  session.commit();
              }