[jboss-cvs] JBossAS SVN: r74478 - trunk/connector/src/main/org/jboss/resource/adapter/jms/inflow.

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

Author: jesper.pedersen
Date: 2008-06-12 07:22:46 -0400 (Thu, 12 Jun 2008)
New Revision: 74478

Modified:
   trunk/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsActivationSpec.java
Log:
[JBAS-5623] JMS ActivationSpec 'acknowledgeMode' not spec compliant

Modified: trunk/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsActivationSpec.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsActivationSpec.java	2008-06-12 11:20:12 UTC (rev 74477)
+++ trunk/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsActivationSpec.java	2008-06-12 11:22:46 UTC (rev 74478)
@@ -166,11 +166,11 @@
    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";
    }
 
    /**
@@ -178,9 +178,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;