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

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

Author: flavia.rainone at jboss.com
Date: 2008-08-29 13:15:58 -0400 (Fri, 29 Aug 2008)
New Revision: 77661

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ConstructorMetaData.java
Log:
[JBAOP-628] Add a check to ConstructorMetaData.resolve(Invocation) method. Now, it is compatible with both
ConstructorInvocation and ConstructionInvocation.

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ConstructorMetaData.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ConstructorMetaData.java	2008-08-29 16:11:19 UTC (rev 77660)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ConstructorMetaData.java	2008-08-29 17:15:58 UTC (rev 77661)
@@ -20,14 +20,16 @@
   * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   */
 package org.jboss.aop.metadata;
+import java.lang.reflect.Constructor;
+import java.util.HashMap;
+import java.util.Iterator;
+
 import javassist.CtConstructor;
+
+import org.jboss.aop.joinpoint.ConstructionInvocation;
 import org.jboss.aop.joinpoint.ConstructorInvocation;
 import org.jboss.aop.joinpoint.Invocation;
 import org.jboss.aop.util.PayloadKey;
-
-import java.lang.reflect.Constructor;
-import java.util.HashMap;
-import java.util.Iterator;
 /**
  *
  * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
@@ -113,7 +115,15 @@
 
    public Object resolve(Invocation invocation, Object tag, Object attr)
    {
-      Constructor<?> constructor = ((ConstructorInvocation)invocation).getConstructor();
+      Constructor<?> constructor = null;
+      if (invocation instanceof ConstructorInvocation)
+      {
+         constructor = ((ConstructorInvocation)invocation).getConstructor();
+      }
+      else
+      {
+         constructor = ((ConstructionInvocation)invocation).getConstructor();
+      }
       return getConstructorMetaData(constructor, tag, attr);
    }