[jboss-cvs] JBossAS SVN: r76781 - projects/aop/trunk/aop/src/main/org/jboss/aop.

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

Author: flavia.rainone at jboss.com
Date: 2008-08-07 15:38:10 -0400 (Thu, 07 Aug 2008)
New Revision: 76781

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/ClassAdvisor.java
Log:
[JBAOP-620] The fix caused a NPE in 4.2 AS. The cause of this is that we were trying to add elements to the
deprecated collections before they were initialised. Now this is fixed.

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java	2008-08-07 19:16:54 UTC (rev 76780)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java	2008-08-07 19:38:10 UTC (rev 76781)
@@ -1846,7 +1846,8 @@
             adviceBindings.add(binding);
             binding.addAdvisor(this);
             pointcutResolved(constructorInfos[i], binding, new ConstructorJoinpoint(constructor));
-            if (AspectManager.maintainAdvisorMethodInterceptors)
+            // if we must keep track of deprecated fields and the field is already initialized
+            if (AspectManager.maintainAdvisorMethodInterceptors && constructorInterceptors != null)
             {
                constructorInterceptors[i] = constructorInfos[i].getInterceptors();
             }
@@ -1868,7 +1869,8 @@
                adviceBindings.add(binding);
                binding.addAdvisor(this);
                pointcutResolved(info, binding, new ConstructorJoinpoint(constructor));
-               if (AspectManager.maintainAdvisorMethodInterceptors)
+               // if we must keep track of deprecated fields and the field is already initialized
+               if (AspectManager.maintainAdvisorMethodInterceptors && this.constructionInterceptors != null)
                {
                   this.constructionInterceptors[i] = constructionInfos[i].getInterceptors();
                }

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/ClassAdvisor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/ClassAdvisor.java	2008-08-07 19:16:54 UTC (rev 76780)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ClassAdvisor.java	2008-08-07 19:38:10 UTC (rev 76781)
@@ -441,7 +441,7 @@
             adviceBindings.add(binding);
             binding.addAdvisor(this);
             pointcutResolved(newFieldInfos[i], binding, new FieldJoinpoint(field));
-            if (AspectManager.maintainAdvisorMethodInterceptors)
+            if (AspectManager.maintainAdvisorMethodInterceptors && this.initialized)
             {
                interceptors[i] = newFieldInfos[i].getInterceptors();
             }