[jboss-cvs] JBossAS SVN: r112525 - 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-20 11:31:16 -0500 (Tue, 20 Dec 2011)
New Revision: 112525

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 - using a system property now

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-19 23:03:27 UTC (rev 112524)
+++ branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java	2011-12-20 16:31:16 UTC (rev 112525)
@@ -153,7 +153,6 @@
    private String recoverSecurityDomain = null;
    private String recoverUserName = null;
    private String recoverPassword = null;
-   private boolean recoverConnectionValidation = true;
    private String connectionManager = null;
    
    /**
@@ -457,7 +456,6 @@
 
             recoverUserName = xdsdm.getRecoverUserName();
             recoverPassword = xdsdm.getRecoverPassWord();
-            recoverConnectionValidation = xdsdm.isRecoverConnectionValidation();
 
             if (recoverUserName == null)
             {
@@ -487,10 +485,7 @@
                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);
@@ -866,7 +861,7 @@
          }
          else
          {
-            if (!recoverConnectionValidation)
+            if ("false".equals(System.getProperty("recover-connection-validation", "true"));)
             {
                if (log.isDebugEnabled())
                   log.debug("Recovery connection validation is disabled.  Forcing recreate of managed connection.");

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-19 23:03:27 UTC (rev 112524)
+++ branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java	2011-12-20 16:31:16 UTC (rev 112525)
@@ -83,10 +83,6 @@
    @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;
@@ -263,15 +259,4 @@
       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;
-   }
-
 }