[jboss-cvs] JBossAS SVN: r98881 - branches/JBoss_AOP_1_5_5_JBPAPP-3256/aop/src/main/org/jboss/aop/annotation.

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

Author: jiwils
Date: 2009-12-23 01:36:38 -0500 (Wed, 23 Dec 2009)
New Revision: 98881

Modified:
   branches/JBoss_AOP_1_5_5_JBPAPP-3256/aop/src/main/org/jboss/aop/annotation/AnnotationElement.java
   branches/JBoss_AOP_1_5_5_JBPAPP-3256/aop/src/main/org/jboss/aop/annotation/PortableAnnotationElement.java
Log:
Fix for JBPAPP-3256.  Resolved issues with null fields and constructors returned by ReflectToJavassist.*ToJavassist methods.

Modified: branches/JBoss_AOP_1_5_5_JBPAPP-3256/aop/src/main/org/jboss/aop/annotation/AnnotationElement.java
===================================================================
--- branches/JBoss_AOP_1_5_5_JBPAPP-3256/aop/src/main/org/jboss/aop/annotation/AnnotationElement.java	2009-12-23 06:28:58 UTC (rev 98880)
+++ branches/JBoss_AOP_1_5_5_JBPAPP-3256/aop/src/main/org/jboss/aop/annotation/AnnotationElement.java	2009-12-23 06:36:38 UTC (rev 98881)
@@ -89,12 +89,12 @@
    {
       try
       {
-         CtConstructor ctMethod = ReflectToJavassist.constructorToJavassist(con);
-         if (ctMethod == null)
+         CtConstructor ctConstructor = ReflectToJavassist.constructorToJavassist(con);
+         if (ctConstructor == null)
          {
             return null;
          }
-         MethodInfo mi = ctMethod.getMethodInfo2();
+         MethodInfo mi = ctConstructor.getMethodInfo2();
 
          AnnotationsAttribute visible = (AnnotationsAttribute) mi.getAttribute(AnnotationsAttribute.visibleTag);
          if (visible == null) return null;
@@ -119,6 +119,10 @@
       try
       {
          CtField ctField = ReflectToJavassist.fieldToJavassist(field);
+         if (ctField == null)
+         {
+            return null;
+         }
          FieldInfo mi = ctField.getFieldInfo2();
 
          AnnotationsAttribute visible = (AnnotationsAttribute) mi.getAttribute(AnnotationsAttribute.visibleTag);
@@ -157,8 +161,9 @@
 
    public static boolean isVisibleAnnotationPresent(Field field, Class annotation) throws Exception
    {
-      CtField ctMethod = ReflectToJavassist.fieldToJavassist(field);
-      return isVisibleAnnotationPresent(ctMethod, annotation.getName());
+      CtField ctField = ReflectToJavassist.fieldToJavassist(field);
+      return ctField != null && 
+         isVisibleAnnotationPresent(ctField, annotation.getName());
    }
 
    public static boolean isVisibleAnnotationPresent(Class clazz, Class annotation) throws Exception
@@ -172,8 +177,9 @@
 
    public static boolean isVisibleAnnotationPresent(Constructor con, Class annotation) throws Exception
    {
-      CtConstructor ctMethod = ReflectToJavassist.constructorToJavassist(con);
-      return isVisibleAnnotationPresent(ctMethod, annotation.getName());
+      CtConstructor ctConstructor = ReflectToJavassist.constructorToJavassist(con);
+      return ctConstructor != null &&
+         isVisibleAnnotationPresent(ctConstructor, annotation.getName());
 
 
    }

Modified: branches/JBoss_AOP_1_5_5_JBPAPP-3256/aop/src/main/org/jboss/aop/annotation/PortableAnnotationElement.java
===================================================================
--- branches/JBoss_AOP_1_5_5_JBPAPP-3256/aop/src/main/org/jboss/aop/annotation/PortableAnnotationElement.java	2009-12-23 06:28:58 UTC (rev 98880)
+++ branches/JBoss_AOP_1_5_5_JBPAPP-3256/aop/src/main/org/jboss/aop/annotation/PortableAnnotationElement.java	2009-12-23 06:36:38 UTC (rev 98881)
@@ -50,8 +50,9 @@
 {
    public static boolean isInvisibleAnnotationPresent(Field field, String annotation) throws Exception
    {
-      CtField ctMethod = ReflectToJavassist.fieldToJavassist(field);
-      return AnnotationElement.isInvisibleAnnotationPresent(ctMethod, annotation);
+      CtField ctField = ReflectToJavassist.fieldToJavassist(field);
+      return ctField != null && AnnotationElement.
+         isInvisibleAnnotationPresent(ctField, annotation);
 
    }
 
@@ -111,7 +112,8 @@
    public static boolean isAnyAnnotationPresent(Field field, String annotation) throws Exception
    {
       CtField ctField = ReflectToJavassist.fieldToJavassist(field);
-      return AnnotationElement.isAnyAnnotationPresent(ctField, annotation);
+      return ctField != null && AnnotationElement.
+         isAnyAnnotationPresent(ctField, annotation);
 
    }
 
@@ -145,8 +147,9 @@
 
    public static boolean isInvisibleAnnotationPresent(Constructor con, String annotation) throws Exception
    {
-      CtConstructor ctMethod = ReflectToJavassist.constructorToJavassist(con);
-      return AnnotationElement.isInvisibleAnnotationPresent(ctMethod, annotation);
+      CtConstructor ctConstructor = ReflectToJavassist.constructorToJavassist(con);
+      return ctConstructor != null && AnnotationElement.
+         isInvisibleAnnotationPresent(ctConstructor, annotation);
 
 
    }
@@ -175,8 +178,9 @@
 
    public static boolean isAnyAnnotationPresent(Constructor con, String annotation) throws Exception
    {
-      CtConstructor ctMethod = ReflectToJavassist.constructorToJavassist(con);
-      return AnnotationElement.isAnyAnnotationPresent(ctMethod, annotation);
+      CtConstructor ctConstructor = ReflectToJavassist.constructorToJavassist(con);
+      return ctConstructor != null && AnnotationElement.
+         isAnyAnnotationPresent(ctConstructor, annotation);
 
    }
 
@@ -290,8 +294,12 @@
    {
       try
       {
-         CtConstructor ctMethod = ReflectToJavassist.constructorToJavassist(con);
-         MethodInfo mi = ctMethod.getMethodInfo2();
+         CtConstructor ctConstructor = ReflectToJavassist.constructorToJavassist(con);
+         if (ctConstructor == null)
+         {
+            return null;
+         }
+         MethodInfo mi = ctConstructor.getMethodInfo2();
 
 
          AnnotationsAttribute invisible = (AnnotationsAttribute) mi.getAttribute(AnnotationsAttribute.invisibleTag);
@@ -310,6 +318,10 @@
       try
       {
          CtField ctField = ReflectToJavassist.fieldToJavassist(field);
+         if (ctField == null)
+         {
+            return null;
+         }
          FieldInfo mi = ctField.getFieldInfo2();
 
 
@@ -388,8 +400,9 @@
    public static boolean isAnyAnnotationPresent(Field field, Class annotation) throws Exception
    {
       if (AnnotationElement.isVisibleAnnotationPresent(field, annotation)) return true;
-      CtField ctMethod = ReflectToJavassist.fieldToJavassist(field);
-      return isInvisibleAnnotationPresent(ctMethod, annotation.getName());
+      CtField ctField = ReflectToJavassist.fieldToJavassist(field);
+      return ctField != null &&
+         isInvisibleAnnotationPresent(ctField, annotation.getName());
    }
 
    public static boolean isAnyAnnotationPresent(Class clazz, Class annotation) throws Exception
@@ -407,8 +420,9 @@
    public static boolean isAnyAnnotationPresent(Constructor con, Class annotation) throws Exception
    {
       if (AnnotationElement.isVisibleAnnotationPresent(con, annotation)) return true;
-      CtConstructor ctMethod = ReflectToJavassist.constructorToJavassist(con);
-      return isVisibleAnnotationPresent(ctMethod, annotation.getName());
+      CtConstructor ctConstructor = ReflectToJavassist.constructorToJavassist(con);
+      return ctConstructor != null &&
+         isVisibleAnnotationPresent(ctConstructor, annotation.getName());
 
 
    }
@@ -429,8 +443,9 @@
 
    public static boolean isVisibleAnnotationPresent(Field field, String annotation) throws Exception
    {
-      CtField ctMethod = ReflectToJavassist.fieldToJavassist(field);
-      return isVisibleAnnotationPresent(ctMethod, annotation);
+      CtField ctField = ReflectToJavassist.fieldToJavassist(field);
+      return ctField != null &&
+         isVisibleAnnotationPresent(ctField, annotation);
    }
 
    public static boolean isVisibleAnnotationPresent(Class clazz, String annotation) throws Exception
@@ -447,8 +462,9 @@
 
    public static boolean isVisibleAnnotationPresent(Constructor con, String annotation) throws Exception
    {
-      CtConstructor ctMethod = ReflectToJavassist.constructorToJavassist(con);
-      return isVisibleAnnotationPresent(ctMethod, annotation);
+      CtConstructor ctConstructor = ReflectToJavassist.constructorToJavassist(con);
+      return ctConstructor != null &&
+         isVisibleAnnotationPresent(ctConstructor, annotation);
 
 
    }