[jboss-cvs] JBossAS SVN: r111350 - projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds.

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

Author: maeste
Date: 2011-05-12 09:12:06 -0400 (Thu, 12 May 2011)
New Revision: 111350

Modified:
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java
Log:
JBJCA-569 fixing XADataSource validate() method

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java	2011-05-12 08:37:19 UTC (rev 111349)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java	2011-05-12 13:12:06 UTC (rev 111350)
@@ -271,7 +271,8 @@
    @Override
    public void validate() throws ValidateException
    {
-      if (this.xaDataSourceClass == null || this.xaDataSourceClass.trim().length() == 0)
+      if ((this.xaDataSourceClass == null || this.xaDataSourceClass.trim().length() == 0) &&
+          (this.driver == null || this.driver.trim().length() == 0))
          throw new ValidateException("xaDataSourceClass (xml tag " + Tag.XADATASOURCECLASS + ") is required");
       if (this.xaDataSourceProperty.isEmpty())
          throw new ValidateException("at least one xaDataSourceProperty (xml tag " + Tag.XADATASOURCEPROPERTY +