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

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

Author: jesper.pedersen
Date: 2008-06-12 07:25:35 -0400 (Thu, 12 Jun 2008)
New Revision: 74479

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

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	2008-06-12 11:22:46 UTC (rev 74478)
+++ branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsActivationSpec.java	2008-06-12 11:25:35 UTC (rev 74479)
@@ -122,7 +122,7 @@
    
    private Boolean isSameRMOverrideValue;
    
-private boolean forceClearOnShutdown = false;
+   private boolean forceClearOnShutdown = false;
    
    private long forceClearOnShutdownInterval = 1000;
    
@@ -157,18 +157,18 @@
    {
       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";
    }
 
    /**
@@ -176,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;
@@ -698,7 +698,7 @@
    {
       this.redeliverUnspecified = redeliverUnspecified;
    }
-
+   
    public int getTransactionTimeout()
    {
       return transactionTimeout;
@@ -719,6 +719,4 @@
       this.isSameRMOverrideValue = isSameRMOverrideValue;
    }
 
-
-
-}
\ No newline at end of file
+}