[jboss-cvs] JBossAS SVN: r93355 - projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading.

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

Author: thomas.diesler at jboss.com
Date: 2009-09-10 07:27:05 -0400 (Thu, 10 Sep 2009)
New Revision: 93355

Modified:
   projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiClassLoaderPolicyDeployer.java
Log:
Less assumptions in ClassLoaderPolicyDEployer - WIP

Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiClassLoaderPolicyDeployer.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiClassLoaderPolicyDeployer.java	2009-09-10 11:25:26 UTC (rev 93354)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiClassLoaderPolicyDeployer.java	2009-09-10 11:27:05 UTC (rev 93355)
@@ -59,18 +59,22 @@
    public OSGiClassLoaderPolicyDeployer()
    {
       setStage(DeploymentStages.CLASSLOADER);
-      setInput(ClassLoader.class);
-      addInput(OSGiBundleState.class);
+      addInput(ClassLoader.class);
       setTopLevelOnly(true);
-      setAllInputs(true);
    }
 
    public void deploy(DeploymentUnit unit) throws DeploymentException
    {
       OSGiBundleState bundleState = unit.getAttachment(OSGiBundleState.class);
+      if (bundleState == null)
+         return;
       
-      OSGiBundleClassLoader classLoader = (OSGiBundleClassLoader)unit.getClassLoader();
-      ClassLoaderPolicy policy = classLoader.getClassLoaderPolicy();
+      ClassLoader classLoader = unit.getClassLoader();
+      if (classLoader instanceof OSGiBundleClassLoader == false)
+         return;
+      
+      OSGiBundleClassLoader bundleLoader = (OSGiBundleClassLoader)classLoader;
+      ClassLoaderPolicy policy = bundleLoader.getClassLoaderPolicy();
 
       // Get excluded packages
       List<String> excludedPackages = getExcludedPackages(bundleState, policy);