[jboss-cvs] JBossAS SVN: r60926 - branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/inflow.

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

Author: weston.price at jboss.com
Date: 2007-02-26 21:06:15 -0500 (Mon, 26 Feb 2007)
New Revision: 60926

Modified:
   branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsActivationSpec.java
   branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsServerSession.java
Log:
[JBAS-3183] Removed serialization implementation as well as added
XAResource wrapping to JMS inflow to support WASMQ.

Modified: branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsActivationSpec.java
===================================================================
--- branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsActivationSpec.java	2007-02-27 02:06:01 UTC (rev 60925)
+++ branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsActivationSpec.java	2007-02-27 02:06:15 UTC (rev 60926)
@@ -120,6 +120,8 @@
    
    private int transactionTimeout;
    
+   private Boolean isSameRMOverrideValue;
+   
    /**
     * @return the acknowledgeMode.
     */
@@ -671,6 +673,16 @@
       this.transactionTimeout = transactionTimeout;
    }
    
-   
+   public Boolean getIsSameRMOverrideValue()
+   {
+      return isSameRMOverrideValue;
+   }
 
+   public void setIsSameRMOverrideValue(Boolean isSameRMOverrideValue)
+   {
+      this.isSameRMOverrideValue = isSameRMOverrideValue;
+   }
+
+
+
 }
\ No newline at end of file

Modified: branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsServerSession.java
===================================================================
--- branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsServerSession.java	2007-02-27 02:06:01 UTC (rev 60925)
+++ branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsServerSession.java	2007-02-27 02:06:15 UTC (rev 60926)
@@ -410,8 +410,8 @@
 
             if (xaSession != null)
             {
-               XAResource res = xaSession.getXAResource();
-
+               XAResource res = JcaXAResourceWrapperFactory.getResourceWrapper(xaSession.getXAResource(), pool.getActivation().getActivationSpec().getIsSameRMOverrideValue());
+                  
                if (!trans.enlistResource(res))
                {
                   throw new JMSException("could not enlist resource");
@@ -442,7 +442,11 @@
          {
 
             if (trace)
+            {
                log.trace(JmsServerSession.this + " using TM to mark TX for rollback tx=" + trans);
+               
+            }
+
             trans.setRollbackOnly();
          }
          catch (Throwable t)