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

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

Author: maeste
Date: 2010-10-25 11:34:37 -0400 (Mon, 25 Oct 2010)
New Revision: 108878

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
Log:
fixing a bug exposed in AS7 environment

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	2010-10-25 15:34:09 UTC (rev 108877)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java	2010-10-25 15:34:37 UTC (rev 108878)
@@ -62,7 +62,7 @@
 public abstract class AbstractDsDeployer
 {
    /** log **/
-   protected static Logger log = Logger.getLogger(DsXmlDeployer.class);
+   protected static Logger log = Logger.getLogger(AbstractDsDeployer.class);
 
    /** jdbcLocal **/
    protected String jdbcLocal;
@@ -207,8 +207,7 @@
                   {
                      String jndiName = dataSource.getJndiName();
 
-                     if (dataSource.isUseJavaContext() != null &&
-                         dataSource.isUseJavaContext().booleanValue() &&
+                     if (dataSource.isUseJavaContext() != null && dataSource.isUseJavaContext().booleanValue() &&
                          !jndiName.startsWith("java:/"))
                      {
                         jndiName = "java:/" + jndiName;
@@ -247,8 +246,7 @@
                   {
                      String jndiName = xaDataSource.getJndiName();
 
-                     if (xaDataSource.isUseJavaContext() != null &&
-                         xaDataSource.isUseJavaContext().booleanValue() &&
+                     if (xaDataSource.isUseJavaContext() != null && xaDataSource.isUseJavaContext().booleanValue() &&
                          !jndiName.startsWith("java:/"))
                      {
                         jndiName = "java:/" + jndiName;
@@ -274,10 +272,9 @@
                log.error("Deployment of XA datasources disabled since jdbc-xa.rar couldn't be found");
          }
 
-         return new CommonDeployment(url, deploymentName, true, null, 
-                                     cfs.toArray(new Object[cfs.size()]), jndis.toArray(new String[jndis.size()]),
-                                     null, null, null,
-                                     parentClassLoader, log);
+         return new CommonDeployment(url, deploymentName, true, null, cfs.toArray(new Object[cfs.size()]),
+                                     jndis.toArray(new String[jndis.size()]), null, null, null, parentClassLoader,
+                                     log);
       }
       catch (Throwable t)
       {
@@ -340,7 +337,7 @@
       {
          poolName = ds.getPoolName();
       }
- 
+
       if (poolName == null)
          poolName = jndiName;
 
@@ -424,7 +421,7 @@
       {
          poolName = ds.getPoolName();
       }
- 
+
       if (poolName == null)
          poolName = jndiName;