[jboss-cvs] JBossAS SVN: r92143 - projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop.

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

Author: kabir.khan at jboss.com
Date: 2009-08-07 13:19:48 -0400 (Fri, 07 Aug 2009)
New Revision: 92143

Modified:
   projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/InstanceAdvisorDelegate.java
Log:
[JBAOP-745] Fix NPE

Modified: projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/InstanceAdvisorDelegate.java
===================================================================
--- projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/InstanceAdvisorDelegate.java	2009-08-07 17:19:17 UTC (rev 92142)
+++ projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/InstanceAdvisorDelegate.java	2009-08-07 17:19:48 UTC (rev 92143)
@@ -260,6 +260,7 @@
    {
       if (joinpointAspects == null) return null;
       Map<Joinpoint, Object> map = joinpointAspects.get(def);
+      if (map == null) return null;
       Object aspect = map.get(joinpoint);
       return aspect;
    }