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

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

Author: jesper.pedersen
Date: 2008-06-18 05:51:51 -0400 (Wed, 18 Jun 2008)
New Revision: 74782

Modified:
   branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsActivationSpec.java
Log:
[JBPAPP-893] JMS ActivationSpec 'acknowledgeMode' does not follow spec recommendation

Modified: branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsActivationSpec.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsActivationSpec.java	2008-06-18 09:50:16 UTC (rev 74781)
+++ branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsActivationSpec.java	2008-06-18 09:51:51 UTC (rev 74782)
@@ -158,18 +158,17 @@
       this.forceClearAttempts = forceClearAttempts;
    }
 
-   
    /**
     * @return the acknowledgeMode.
     */
    public String getAcknowledgeMode()
    {
       if (sessionTransacted)
-         return "TRANSACTED";
+         return "Transacted";
       else if (Session.DUPS_OK_ACKNOWLEDGE == acknowledgeMode)
-         return "DUPS_OK_ACKNOWLEDGE";
+         return "Dups-ok-acknowledge";
       else
-         return "AUTO_ACKNOWLEDGE";
+         return "Auto-acknowledge";
    }
 
    /**
@@ -177,9 +176,9 @@
     */
    public void setAcknowledgeMode(String acknowledgeMode)
    {
-      if ("DUPS_OK_ACKNOWLEDGE".equals(acknowledgeMode))
+      if ("DUPS_OK_ACKNOWLEDGE".equals(acknowledgeMode) || "Dups-ok-acknowledge".equals(acknowledgeMode))
          this.acknowledgeMode = Session.DUPS_OK_ACKNOWLEDGE;
-      else if ("AUTO_ACKNOWLEDGE".equals(acknowledgeMode))
+      else if ("AUTO_ACKNOWLEDGE".equals(acknowledgeMode) || "Auto-acknowledge".equals(acknowledgeMode))
          this.acknowledgeMode = Session.AUTO_ACKNOWLEDGE;
       else if ("SESSION_TRANSACTED".equals(acknowledgeMode))
          this.acknowledgeMode = Session.SESSION_TRANSACTED;
@@ -720,6 +719,4 @@
       this.isSameRMOverrideValue = isSameRMOverrideValue;
    }
 
-
-
 }
\ No newline at end of file