[jboss-cvs] JBossAS SVN: r74294 - projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/joinpoint/graph.

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

Author: flavia.rainone at jboss.com
Date: 2008-06-08 18:26:16 -0400 (Sun, 08 Jun 2008)
New Revision: 74294

Modified:
   projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/joinpoint/graph/AdvisedData.java
   projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/joinpoint/graph/BehaviorNode.java
Log:
[JBAOP-504] Advisor was not being set in BehaviorNode, causing NullPointerException.

Modified: projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/joinpoint/graph/AdvisedData.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/joinpoint/graph/AdvisedData.java	2008-06-08 22:23:21 UTC (rev 74293)
+++ projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/joinpoint/graph/AdvisedData.java	2008-06-08 22:26:16 UTC (rev 74294)
@@ -69,7 +69,7 @@
       BehaviorNode behaviorNode = behaviors.searchValue(behaviorKey);
       if (behaviorNode == null)
       {
-         behaviorNode = new BehaviorNode(advisor, method);
+         behaviorNode = new BehaviorNode(this.advisor, method);
          TreeInsertionUtil.insertNode(behaviorNode, behaviorKey, behaviors);
       }
       return behaviorNode;

Modified: projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/joinpoint/graph/BehaviorNode.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/joinpoint/graph/BehaviorNode.java	2008-06-08 22:23:21 UTC (rev 74293)
+++ projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/joinpoint/graph/BehaviorNode.java	2008-06-08 22:26:16 UTC (rev 74294)
@@ -46,12 +46,14 @@
    
    public BehaviorNode(Advisor advisor, Method member)
    {
+      this.advisor = advisor;
       this.member = member;
       this.behaviourType = BehaviourType.METHOD;
    }
    
    public BehaviorNode(Advisor advisor, Constructor member)
    {
+      this.advisor = advisor;
       this.member = member;
       this.behaviourType = BehaviourType.CONSTRUCTOR;
    }