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

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Aug 5 10:38:08 EDT 2010


Author: jesper.pedersen
Date: 2010-08-05 10:38:08 -0400 (Thu, 05 Aug 2010)
New Revision: 107437

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
Log:
Use the correct method

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-08-05 13:47:29 UTC (rev 107436)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java	2010-08-05 14:38:08 UTC (rev 107437)
@@ -411,14 +411,13 @@
             // ResourceAdapter
             if (cmd.getVersion() != Version.V_10)
             {
-               if (cmd.getResourceadapter() != null && cmd.getResourceadapter().getClass() != null)
+               ResourceAdapter1516 ra1516 = (ResourceAdapter1516)cmd.getResourceadapter();
+               if (ra1516 != null && ra1516.getResourceadapterClass() != null)
                {
                   partialFailures =
                         validateArchive(url, Arrays.asList((Validate) new ValidateClass(Key.RESOURCE_ADAPTER,
-                              ((ResourceAdapter1516) cmd.getResourceadapter()).getResourceadapterClass(),
-                                                                                     cl,
-                                                                                     cmd.getResourceadapter()
-                                                                                           .getConfigProperties())));
+                           ra1516.getResourceadapterClass(), cl, cmd.getResourceadapter().getConfigProperties())));
+
                   if (partialFailures != null)
                   {
                      failures = new HashSet<Failure>();
@@ -429,9 +428,7 @@
                   {
                      resourceAdapter =
                            (ResourceAdapter) initAndInject(
-                                 ((ResourceAdapter1516) cmd.getResourceadapter()).getResourceadapterClass(), cmd
-                                       .getResourceadapter().getConfigProperties(),
-                                 cl);
+                                 ra1516.getResourceadapterClass(), ra1516.getConfigProperties(), cl);
 
                      if (trace)
                      {
@@ -442,7 +439,7 @@
 
                      archiveValidationObjects.add(new ValidateObject(Key.RESOURCE_ADAPTER,
                                                                      resourceAdapter,
-                                                                     cmd.getResourceadapter().getConfigProperties()));
+                                                                     ra1516.getConfigProperties()));
                      beanValidationObjects.add(resourceAdapter);
                   }
                }



More information about the jboss-cvs-commits mailing list