[jboss-cvs] JBossAS SVN: r112589 - projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 31 10:33:17 EST 2012
Author: jesper.pedersen
Date: 2012-01-31 10:33:16 -0500 (Tue, 31 Jan 2012)
New Revision: 112589
Modified:
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
Log:
[JBJCA-737] Wrong defaults for a non-defined xa-pool
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2012-01-31 15:31:54 UTC (rev 112588)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2012-01-31 15:33:16 UTC (rev 112589)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.deployers.common;
+import org.jboss.jca.common.api.metadata.Defaults;
import org.jboss.jca.common.api.metadata.common.CommonPool;
import org.jboss.jca.common.api.metadata.common.CommonTimeOut;
import org.jboss.jca.common.api.metadata.common.CommonValidation;
@@ -592,7 +593,7 @@
// Create the pool
PoolConfiguration pc = createPoolConfiguration(ds.getXaPool(), ds.getTimeOut(), ds.getValidation());
- Boolean noTxSeparatePool = Boolean.FALSE;
+ Boolean noTxSeparatePool = Defaults.NO_TX_SEPARATE_POOL;
if (ds.getXaPool() != null && ds.getXaPool().isNoTxSeparatePool() != null)
noTxSeparatePool = ds.getXaPool().isNoTxSeparatePool();
@@ -621,11 +622,11 @@
// Connection manager properties
Integer allocationRetry = null;
Long allocationRetryWaitMillis = null;
- Boolean interleaving = null;
+ Boolean interleaving = Defaults.INTERLEAVING;
Integer xaResourceTimeout = null;
- Boolean isSameRMOverride = null;
- Boolean wrapXAResource = null;
- Boolean padXid = null;
+ Boolean isSameRMOverride = Defaults.IS_SAME_RM_OVERRIDE;
+ Boolean wrapXAResource = Defaults.WRAP_XA_RESOURCE;
+ Boolean padXid = Defaults.PAD_XID;
if (ds.getTimeOut() != null)
{
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2012-01-31 15:31:54 UTC (rev 112588)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2012-01-31 15:33:16 UTC (rev 112589)
@@ -22,6 +22,7 @@
package org.jboss.jca.deployers.common;
+import org.jboss.jca.common.api.metadata.Defaults;
import org.jboss.jca.common.api.metadata.common.CommonAdminObject;
import org.jboss.jca.common.api.metadata.common.CommonConnDef;
import org.jboss.jca.common.api.metadata.common.CommonPool;
@@ -1304,7 +1305,7 @@
PoolFactory pf = new PoolFactory();
- Boolean noTxSeparatePool = Boolean.FALSE;
+ Boolean noTxSeparatePool = Defaults.NO_TX_SEPARATE_POOL;
if (connectionDefinition != null &&
connectionDefinition.getPool() != null &&
@@ -1414,19 +1415,22 @@
}
else
{
- Boolean interleaving = null;
+ Boolean interleaving = Defaults.INTERLEAVING;
Integer xaResourceTimeout = null;
- Boolean isSameRMOverride = null;
- Boolean wrapXAResource = null;
- Boolean padXid = null;
+ Boolean isSameRMOverride = Defaults.IS_SAME_RM_OVERRIDE;
+ Boolean wrapXAResource = Defaults.WRAP_XA_RESOURCE;
+ Boolean padXid = Defaults.PAD_XID;
if (connectionDefinition != null && connectionDefinition.isXa())
{
CommonXaPool xaPool = (CommonXaPool)connectionDefinition.getPool();
- interleaving = xaPool.isInterleaving();
- isSameRMOverride = xaPool.isSameRmOverride();
- wrapXAResource = xaPool.isWrapXaResource();
- padXid = xaPool.isPadXid();
+ if (xaPool != null)
+ {
+ interleaving = xaPool.isInterleaving();
+ isSameRMOverride = xaPool.isSameRmOverride();
+ wrapXAResource = xaPool.isWrapXaResource();
+ padXid = xaPool.isPadXid();
+ }
}
cm = cmf.createTransactional(tsl, pool,
@@ -1688,7 +1692,7 @@
PoolFactory pf = new PoolFactory();
- Boolean noTxSeparatePool = Boolean.FALSE;
+ Boolean noTxSeparatePool = Defaults.NO_TX_SEPARATE_POOL;
if (connectionDefinition != null &&
connectionDefinition.getPool() != null &&
connectionDefinition.isXa())
@@ -1798,21 +1802,24 @@
}
else
{
- Boolean interleaving = null;
+ Boolean interleaving = Defaults.INTERLEAVING;
Integer xaResourceTimeout = null;
- Boolean isSameRMOverride = null;
- Boolean wrapXAResource = null;
- Boolean padXid = null;
+ Boolean isSameRMOverride = Defaults.IS_SAME_RM_OVERRIDE;
+ Boolean wrapXAResource = Defaults.WRAP_XA_RESOURCE;
+ Boolean padXid = Defaults.PAD_XID;
Recovery recoveryMD = null;
if (connectionDefinition != null && connectionDefinition.isXa())
{
CommonXaPool xaPool = (CommonXaPool)connectionDefinition.getPool();
- interleaving = xaPool.isInterleaving();
- isSameRMOverride = xaPool.isSameRmOverride();
- wrapXAResource = xaPool.isWrapXaResource();
- padXid = xaPool.isPadXid();
- recoveryMD = connectionDefinition.getRecovery();
+ if (xaPool != null)
+ {
+ interleaving = xaPool.isInterleaving();
+ isSameRMOverride = xaPool.isSameRmOverride();
+ wrapXAResource = xaPool.isWrapXaResource();
+ padXid = xaPool.isPadXid();
+ recoveryMD = connectionDefinition.getRecovery();
+ }
}
cm = cmf.createTransactional(tsl, pool,
More information about the jboss-cvs-commits
mailing list