[jboss-cvs] JBossAS SVN: r111895 - branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/deployers/builder.

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

Author: jesper.pedersen
Date: 2011-08-01 14:42:45 -0400 (Mon, 01 Aug 2011)
New Revision: 111895

Modified:
   branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/deployers/builder/ConnectionManagerBuilder.java
   branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/deployers/builder/ManagedConnectionPoolBuilder.java
Log:
[JBPAPP-6943] Allocation-retry settings in *-ds.xml don't work

Modified: branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/deployers/builder/ConnectionManagerBuilder.java
===================================================================
--- branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/deployers/builder/ConnectionManagerBuilder.java	2011-08-01 15:47:11 UTC (rev 111894)
+++ branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/deployers/builder/ConnectionManagerBuilder.java	2011-08-01 18:42:45 UTC (rev 111895)
@@ -138,7 +138,13 @@
          attribute = buildSimpleAttribute("SecurityDomainJndiName", md.getSecurityMetaData().getDomain());
          attributes.add(attribute);
       }
-      
+
+      attribute = buildSimpleAttribute("AllocationRetry", String.valueOf(md.getAllocationRetry()));
+      attributes.add(attribute);
+            
+      attribute = buildSimpleAttribute("AllocationRetryWaitMillis", String.valueOf(md.getAllocationRetryWaitMillis()));
+      attributes.add(attribute);
+            
       attribute = new ServiceAttributeMetaData();
       attribute.setName("SubjectFactory");
       ServiceInjectionValueMetaData injectionValue = new ServiceInjectionValueMetaData(subjectFactoryName);

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-08-01 15:47:11 UTC (rev 111894)
+++ branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/deployers/builder/ManagedConnectionPoolBuilder.java	2011-08-01 18:42:45 UTC (rev 111895)
@@ -112,7 +112,10 @@
       }
 
       poolAttributes.add(poolAttribute);
-      
+
+      poolAttribute = buildSimpleAttribute("NoTxSeparatePools", String.valueOf(md.getNoTxSeparatePools()));
+      poolAttributes.add(poolAttribute);
+            
       poolAttribute = buildDependencyAttribute("ManagedConnectionFactoryName", MCF_JMX + md.getJndiName());
       poolAttributes.add(poolAttribute);