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

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

Author: jesper.pedersen
Date: 2009-12-18 03:56:20 -0500 (Fri, 18 Dec 2009)
New Revision: 97978

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Annotations.java
Log:
[JBJCA-240] Split zero and >= 2 case

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 04:49:45 UTC (rev 97977)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Annotations.java	2009-12-18 08:56:20 UTC (rev 97978)
@@ -169,12 +169,24 @@
 
             md = attachConnector(md, c);
          }
+         else if (values.size() == 0)
+         {
+            // JBJCA-240
+            if (md.getRa().getRaClass() == null || md.getRa().getRaClass().equals(""))
+            {
+               log.fatal("No @Connector was found and no definition in the ra.xml metadata either");
+               throw new DeployException("No @Connector defined");
+            }
+         }
          else
          {
-            //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
+            // JBJCA-240
             if (md.getRa().getRaClass() == null || md.getRa().getRaClass().equals(""))
+            {
+               log.fatal("More than one @Connector was found but the correct one " + 
+                         "wasn't defined in the ra.xml metadata");
                throw new DeployException("More than one @Connector defined");
+            }
          }
       }