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

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

Author: jeff.zhang
Date: 2009-12-17 23:33:47 -0500 (Thu, 17 Dec 2009)
New Revision: 97976

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Annotations.java
Log:
[JBJCA-240] Allow multi @Connector if it has deployment description in the ra.xml

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Annotations.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Annotations.java	2009-12-18 03:50:04 UTC (rev 97975)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Annotations.java	2009-12-18 04:33:47 UTC (rev 97976)
@@ -170,7 +170,12 @@
             md = attachConnector(md, c);
          }
          else
-            throw new DeployException("More than one @Connector defined");
+         {
+            //if it define zero @Connector or >=2 @Connector, it should be defined ResourceAdapter class in the ra.xml
+            //see https://jira.jboss.org/jira/browse/JBJCA-240
+            if (md.getRa().getRaClass() == null || md.getRa().getRaClass().equals(""))
+               throw new DeployException("More than one @Connector defined");
+         }
       }
 
       return md;