[jboss-cvs] JBossAS SVN: r110845 - in branches/JBPAPP_5_1/connector/src/main/org/jboss/resource: deployers/management and 1 other directories.

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

Author: jeff.zhang
Date: 2011-03-07 18:58:12 -0500 (Mon, 07 Mar 2011)
New Revision: 110845

Modified:
   branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/deployers/builder/ManagedConnectionPoolBuilder.java
   branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java
   branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
Log:
[JBPAPP-6019] Setting <use-fast-fail>true</use-fast-fail> in *-ds.xml don't become effective

Modified: branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/deployers/builder/ManagedConnectionPoolBuilder.java
===================================================================
--- branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/deployers/builder/ManagedConnectionPoolBuilder.java	2011-03-07 21:30:43 UTC (rev 110844)
+++ branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/deployers/builder/ManagedConnectionPoolBuilder.java	2011-03-07 23:58:12 UTC (rev 110845)
@@ -98,6 +98,9 @@
       poolAttribute = buildSimpleAttribute("StatisticsFormatter", md.getStatisticsFormatter());
       poolAttributes.add(poolAttribute);
             
+      poolAttribute = buildSimpleAttribute("UseFastFail", String.valueOf(md.getUseFastFail()));
+      poolAttributes.add(poolAttribute);
+
       //Temp fix for JAXB marshalling issue
       if(md.getSecurityMetaData() == null)
       {

Modified: branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java
===================================================================
--- branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java	2011-03-07 21:30:43 UTC (rev 110844)
+++ branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java	2011-03-07 23:58:12 UTC (rev 110845)
@@ -77,6 +77,7 @@
       defaultValues.put("share-prepared-statements", new SimpleValueSupport(SimpleMetaType.BOOLEAN_PRIMITIVE, false));
       defaultValues.put("set-tx-query-timeout", new SimpleValueSupport(SimpleMetaType.BOOLEAN_PRIMITIVE, false));
       defaultValues.put("query-timeout", new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE, 0));
+      defaultValues.put("use-fast-fail", new SimpleValueSupport(SimpleMetaType.BOOLEAN_PRIMITIVE, false));
    }
 
    public DsDataSourceTemplateInfo(String arg0, String arg1, Map<String, ManagedProperty> arg2)

Modified: branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
===================================================================
--- branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java	2011-03-07 21:30:43 UTC (rev 110844)
+++ branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java	2011-03-07 23:58:12 UTC (rev 110845)
@@ -123,6 +123,10 @@
    @XmlElement(name="use-strict-min")
    private Boolean useStrictMin = Boolean.FALSE;
 
+   @XmlElement(name="use-fast-fail")
+   @XmlJavaTypeAdapter(BooleanSystemPropertyXmlJavaTypeAdapter.class)
+   private Boolean useFastFail = Boolean.FALSE;
+
    @XmlJavaTypeAdapter(ManagedConnectionEmptyContentAdapter.class)
    @XmlElement(name="no-tx-separate-pools")
    private Boolean noTxSeparatePools = Boolean.FALSE;
@@ -639,6 +643,16 @@
       this.useStrictMin = useStrictMin;
    }
 
+   @ManagementProperty(name="use-fast-fail", includeInTemplate=true)
+   public Boolean getUseFastFail()
+   {
+      return useFastFail;
+   }
+
+   public void setUseFastFail(Boolean useFastFail)
+   {
+      this.useFastFail = useFastFail;
+   }
    @ManagementProperty(name="statistics-formatter", includeInTemplate=true)
    public String getStatisticsFormatter()
    {