[jboss-cvs] JBossAS SVN: r111193 - 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:42:12 -0400 (Mon, 18 Apr 2011)
New Revision: 111193

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
Log:
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:35:07 UTC (rev 111192)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java	2011-04-18 13:42:12 UTC (rev 111193)
@@ -259,7 +259,7 @@
                      }
                      catch (Throwable t)
                      {
-                        log.error("Error during the deployment of " + dataSource.getJndiName(), t);
+                        log.error("Error during the deployment of " + jndiName, t);
                      }
                   }
                }
@@ -284,14 +284,8 @@
                   {
                      try
                      {
-                        String jndiName = xaDataSource.getJndiName();
+                        String jndiName = buildJndiName(xaDataSource.getJndiName(), xaDataSource.isUseJavaContext());
 
-                        if (xaDataSource.isUseJavaContext() != null && xaDataSource.isUseJavaContext().booleanValue() &&
-                            !jndiName.startsWith("java:/"))
-                        {
-                           jndiName = "java:/" + jndiName;
-                        }
-
                         org.jboss.jca.core.api.management.DataSource mgtDataSource =
                            new org.jboss.jca.core.api.management.DataSource(true);
                         XAResourceRecovery recovery = null;
@@ -311,7 +305,7 @@
                      }
                      catch (Throwable t)
                      {
-                        log.error("Error during the deployment of " + xaDataSource.getJndiName(), t);
+                        log.error("Error during the deployment of " + jndiName, t);
                      }
                   }
                }