[jboss-cvs] JBossAS SVN: r78647 - trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5.

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

Author: kabir.khan at jboss.com
Date: 2008-09-17 12:38:24 -0400 (Wed, 17 Sep 2008)
New Revision: 78647

Modified:
   trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AOPClassLoaderDeployer.java
Log:
[JBAS-5969] Fix NPE introduced in this so far unused deployer

Modified: trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AOPClassLoaderDeployer.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AOPClassLoaderDeployer.java	2008-09-17 15:47:31 UTC (rev 78646)
+++ trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AOPClassLoaderDeployer.java	2008-09-17 16:38:24 UTC (rev 78647)
@@ -66,8 +66,11 @@
       VFSClassLoaderScopingPolicy policy = (VFSClassLoaderScopingPolicy)AspectManager.getClassLoaderScopingPolicy();
 
       AspectManager manager = aspectManager;
-      manager = initializeDomain(policy, unit);
-      
+      Domain domain = initializeDomain(policy, unit);
+      if (domain != null)
+      {
+         manager = domain;
+      }
       unit.getTransientManagedObjects().addAttachment(AspectManager.class, manager);
    }