[Jboss-cvs] JBossAS SVN: r56885 - branches/Branch_4_0/server/src/main/org/jboss/jms/asf

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

Author: weston.price at jboss.com
Date: 2006-09-15 09:39:39 -0400 (Fri, 15 Sep 2006)
New Revision: 56885

Modified:
   branches/Branch_4_0/server/src/main/org/jboss/jms/asf/StdServerSession.java
Log:
[JBAS-3631] Added transaction handling branch to onMessage for StdServerSession.


Modified: branches/Branch_4_0/server/src/main/org/jboss/jms/asf/StdServerSession.java
===================================================================
--- branches/Branch_4_0/server/src/main/org/jboss/jms/asf/StdServerSession.java	2006-09-15 13:31:20 UTC (rev 56884)
+++ branches/Branch_4_0/server/src/main/org/jboss/jms/asf/StdServerSession.java	2006-09-15 13:39:39 UTC (rev 56885)
@@ -357,6 +357,19 @@
                      session.commit();
                   }
                }
+               else
+               {
+                  if(trace)
+                     log.trace(StdServerSession.this + "transaction already ended");
+                  
+                  tm.suspend();
+                  
+                  if (xaSession == null && serverSessionPool.isTransacted())
+                  {
+                     session.commit();
+                  }
+                  
+               }
             }
          }
          catch (Exception e)