[jboss-cvs] JBossAS SVN: r111194 - projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common.

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

Author: jesper.pedersen
Date: 2011-04-18 09:45:14 -0400 (Mon, 18 Apr 2011)
New Revision: 111194

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
Log:
Ok, one more time - Use buildJndiName() for <xa-datasource>

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java	2011-04-18 13:42:12 UTC (rev 111193)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java	2011-04-18 13:45:14 UTC (rev 111194)
@@ -242,10 +242,10 @@
                {
                   if (dataSource.isEnabled())
                   {
+                     String jndiName = buildJndiName(dataSource.getJndiName(), dataSource.isUseJavaContext());
+
                      try
                      {
-                        String jndiName = buildJndiName(dataSource.getJndiName(), dataSource.isUseJavaContext());
-
                         org.jboss.jca.core.api.management.DataSource mgtDataSource =
                            new org.jboss.jca.core.api.management.DataSource(false);
                         Object cf = deployDataSource(dataSource, jndiName, 
@@ -282,10 +282,10 @@
                {
                   if (xaDataSource.isEnabled())
                   {
+                     String jndiName = buildJndiName(xaDataSource.getJndiName(), xaDataSource.isUseJavaContext());
+
                      try
                      {
-                        String jndiName = buildJndiName(xaDataSource.getJndiName(), xaDataSource.isUseJavaContext());
-
                         org.jboss.jca.core.api.management.DataSource mgtDataSource =
                            new org.jboss.jca.core.api.management.DataSource(true);
                         XAResourceRecovery recovery = null;