[jboss-cvs] JBossAS SVN: r107037 - branches/6.0.0.20100721-M4/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers.

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

Author: bstansberry at jboss.com
Date: 2010-07-22 16:31:21 -0400 (Thu, 22 Jul 2010)
New Revision: 107037

Modified:
   branches/6.0.0.20100721-M4/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyIntegrationDeployer.java
Log:
[JBAS-8234] port of CCE fix from trunk

Modified: branches/6.0.0.20100721-M4/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyIntegrationDeployer.java
===================================================================
--- branches/6.0.0.20100721-M4/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyIntegrationDeployer.java	2010-07-22 19:38:58 UTC (rev 107036)
+++ branches/6.0.0.20100721-M4/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyIntegrationDeployer.java	2010-07-22 20:31:21 UTC (rev 107037)
@@ -146,7 +146,8 @@
       {
          Thread.currentThread().getContextClassLoader().loadClass(CDI_INJECTOR_FACTORY_CLASS);
          // don't set this param if CDI    is not in classpath
-         if (((VFSDeploymentUnit) du).getMetaDataFile("beans.xml") != null)
+         final boolean isVFSDU = du instanceof VFSDeploymentUnit;
+         if (isVFSDU && ((VFSDeploymentUnit) du).getMetaDataFile("beans.xml") != null)
          {
             log.debug("***** Found CDI, adding injector factory class");
             setContextParameter(webdata, "resteasy.injector.factory", CDI_INJECTOR_FACTORY_CLASS);