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

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

Author: jesper.pedersen
Date: 2011-05-13 09:02:47 -0400 (Fri, 13 May 2011)
New Revision: 111367

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
Log:
[JBJCA-575] ActivationSpec.validate() not called

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java	2011-05-13 12:04:44 UTC (rev 111366)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java	2011-05-13 13:02:47 UTC (rev 111367)
@@ -88,6 +88,7 @@
 
 import javax.resource.Referenceable;
 import javax.resource.ResourceException;
+import javax.resource.spi.ActivationSpec;
 import javax.resource.spi.BootstrapContext;
 import javax.resource.spi.ManagedConnectionFactory;
 import javax.resource.spi.ResourceAdapter;
@@ -560,19 +561,28 @@
                         if (activateDeployment)
                         {
                            List<? extends ConfigProperty> cpm = mlMD.getActivationspec().getConfigProperties();
+                           String asClass = mlMD.getActivationspec().getActivationspecClass().getValue();
 
-                           Object o = initAndInject(mlMD.getActivationspec().getActivationspecClass().getValue(),
-                              cpm, cl);
+                           ActivationSpec as = (ActivationSpec)initAndInject(asClass, cpm, cl);
 
                            if (trace)
                            {
-                              log.trace("ActivationSpec: " + o.getClass().getName());
-                              log.trace("ActivationSpec defined in classloader: " + o.getClass().getClassLoader());
+                              log.trace("ActivationSpec: " + as.getClass().getName());
+                              log.trace("ActivationSpec defined in classloader: " + as.getClass().getClassLoader());
                            }
 
-                           archiveValidationObjects.add(new ValidateObject(Key.ACTIVATION_SPEC, o, cpm));
-                           beanValidationObjects.add(o);
-                           associateResourceAdapter(resourceAdapter, o);
+                           archiveValidationObjects.add(new ValidateObject(Key.ACTIVATION_SPEC, as, cpm));
+                           beanValidationObjects.add(as);
+                           associateResourceAdapter(resourceAdapter, as);
+
+                           try
+                           {
+                              as.validate();
+                           }
+                           catch (Throwable t)
+                           {
+                              throw new DeployException("Validation exception for " + as, t);
+                           }
                         }
                      }
                   }