[jboss-cvs] JBossAS SVN: r112524 - in branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource: metadata/mcf and 1 other directory.

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

Author: jbertram at redhat.com
Date: 2011-12-19 18:03:27 -0500 (Mon, 19 Dec 2011)
New Revision: 112524

Modified:
   branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java
   branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java
Log:
JBPAPP-7786

Modified: branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java
===================================================================
--- branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java	2011-12-16 21:43:38 UTC (rev 112523)
+++ branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java	2011-12-19 23:03:27 UTC (rev 112524)
@@ -153,6 +153,7 @@
    private String recoverSecurityDomain = null;
    private String recoverUserName = null;
    private String recoverPassword = null;
+   private boolean recoverConnectionValidation = true;
    private String connectionManager = null;
    
    /**
@@ -456,6 +457,7 @@
 
             recoverUserName = xdsdm.getRecoverUserName();
             recoverPassword = xdsdm.getRecoverPassWord();
+            recoverConnectionValidation = xdsdm.isRecoverConnectionValidation();
 
             if (recoverUserName == null)
             {
@@ -485,7 +487,10 @@
                recoverSecurityDomain = securityDomain;
 
             if (log.isDebugEnabled())
+            {
                log.debug("Registered for XA Resource Recovery: " + xdsdm.getJndiName());
+               log.debug("Validate recovery connection: " + recoverConnectionValidation);
+            }
 
             // Variable substitution
             recoverUserName = getSubstitutionValue(recoverUserName);
@@ -861,6 +866,14 @@
          }
          else
          {
+            if (!recoverConnectionValidation)
+            {
+               if (log.isDebugEnabled())
+                  log.debug("Recovery connection validation is disabled.  Forcing recreate of managed connection.");
+
+               return true;
+            }
+
             Method method = null;
             try
             {

Modified: branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java
===================================================================
--- branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java	2011-12-16 21:43:38 UTC (rev 112523)
+++ branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java	2011-12-19 23:03:27 UTC (rev 112524)
@@ -83,6 +83,10 @@
    @XmlJavaTypeAdapter(BooleanSystemPropertyXmlJavaTypeAdapter.class)
    private Boolean noRecover = Boolean.FALSE;
 
+   @XmlElement(name="recover-connection-validation")
+   @XmlJavaTypeAdapter(BooleanSystemPropertyXmlJavaTypeAdapter.class)
+   private Boolean recoverConnectionValidation = Boolean.TRUE;
+
    /** The recoverSecurityMetaData */
    @XmlElement(name="recover-security-domain", type=RecoverSecurityDomainMetaData.class)
    private SecurityMetaData recoverSecurityMetaData;
@@ -258,4 +262,16 @@
    {
       this.noRecover = nr;
    }
+
+   // <recover-connection-validation> element - currently not exposed in the DTD
+   public Boolean isRecoverConnectionValidation()
+   {
+      return recoverConnectionValidation;
+   }
+
+   public void setRecoverConnectionValidation(Boolean rcv)
+   {
+      this.recoverConnectionValidation = rcv;
+   }
+
 }