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

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

Author: jesper.pedersen
Date: 2010-06-14 09:17:48 -0400 (Mon, 14 Jun 2010)
New Revision: 106031

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
Log:
[JBJCA-357] ResourceAdapter should only be validated if defined

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java	2010-06-14 13:17:35 UTC (rev 106030)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java	2010-06-14 13:17:48 UTC (rev 106031)
@@ -362,36 +362,38 @@
          if (cmd != null)
          {
             // ResourceAdapter
-            if (cmd.getRa() != null &&
-                (!cmd.is10() || cmd.getRa().getRaClass() != null))
+            if (!cmd.is10())
             {
-               partialFailures =
-                  validateArchive(url, Arrays.asList((Validate) new ValidateClass(Key.RESOURCE_ADAPTER,
-                                                                                  cmd.getRa().getRaClass(),
-                                                                                  cl,
-                                                                                  cmd.getRa().getConfigProperty())));
-               if (partialFailures != null)
+               if (cmd.getRa() != null && cmd.getRa().getRaClass() != null)
                {
-                  failures = new HashSet<Failure>();
-                  failures.addAll(partialFailures);
-               }
+                  partialFailures =
+                     validateArchive(url, Arrays.asList((Validate) new ValidateClass(Key.RESOURCE_ADAPTER,
+                                                                                     cmd.getRa().getRaClass(),
+                                                                                     cl,
+                                                                                     cmd.getRa().getConfigProperty())));
+                  if (partialFailures != null)
+                  {
+                     failures = new HashSet<Failure>();
+                     failures.addAll(partialFailures);
+                  }
 
-               if (!(getArchiveValidationFailOnError() && hasFailuresLevel(failures, Severity.ERROR)))
-               {
-                  resourceAdapter =
-                     (ResourceAdapter)initAndInject(cmd.getRa().getRaClass(), cmd.getRa().getConfigProperty(), cl);
+                  if (!(getArchiveValidationFailOnError() && hasFailuresLevel(failures, Severity.ERROR)))
+                  {
+                     resourceAdapter =
+                        (ResourceAdapter)initAndInject(cmd.getRa().getRaClass(), cmd.getRa().getConfigProperty(), cl);
 
-                  if (trace)
-                  {
-                     log.trace("ResourceAdapter: " + resourceAdapter.getClass().getName());
-                     log.trace("ResourceAdapter defined in classloader: " +
-                               resourceAdapter.getClass().getClassLoader());
+                     if (trace)
+                     {
+                        log.trace("ResourceAdapter: " + resourceAdapter.getClass().getName());
+                        log.trace("ResourceAdapter defined in classloader: " +
+                                  resourceAdapter.getClass().getClassLoader());
+                     }
+
+                     archiveValidationObjects.add(new ValidateObject(Key.RESOURCE_ADAPTER,
+                                                                     resourceAdapter,
+                                                                     cmd.getRa().getConfigProperty()));
+                     beanValidationObjects.add(resourceAdapter);
                   }
-
-                  archiveValidationObjects.add(new ValidateObject(Key.RESOURCE_ADAPTER,
-                                                                  resourceAdapter,
-                                                                  cmd.getRa().getConfigProperty()));
-                  beanValidationObjects.add(resourceAdapter);
                }
             }