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

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

Author: flavia.rainone at jboss.com
Date: 2009-12-14 23:07:12 -0500 (Mon, 14 Dec 2009)
New Revision: 97825

Modified:
   projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/annotation/PortableAnnotationElement.java
Log:
[JBAOP-734] Added treatment for null fields and constructors returned by ReflectToJavassist.*ToJavassist methods.

Modified: projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/annotation/PortableAnnotationElement.java
===================================================================
--- projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/annotation/PortableAnnotationElement.java	2009-12-15 04:05:52 UTC (rev 97824)
+++ projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/annotation/PortableAnnotationElement.java	2009-12-15 04:07:12 UTC (rev 97825)
@@ -66,8 +66,9 @@
       }
       if(includeInvisibleAnnotation(annotation))
       {
-         CtField ctMethod = ReflectToJavassist.fieldToJavassist(field);
-         return AnnotationElement.isInvisibleAnnotationPresent(ctMethod, annotation);
+         CtField ctField = ReflectToJavassist.fieldToJavassist(field);
+         return ctField != null && AnnotationElement.
+            isInvisibleAnnotationPresent(ctField, annotation);
       }
       else
          return false;
@@ -166,7 +167,8 @@
       if(includeInvisibleAnnotation(annotation))
       {
          CtField ctField = ReflectToJavassist.fieldToJavassist(field);
-         return AnnotationElement.isAnyAnnotationPresent(ctField, annotation);
+         return ctField != null && AnnotationElement.
+            isAnyAnnotationPresent(ctField, annotation);
       }
       else
          return false;
@@ -228,8 +230,9 @@
       }
       if(includeInvisibleAnnotation(annotation))
       {
-         CtConstructor ctMethod = ReflectToJavassist.constructorToJavassist(con);
-         return AnnotationElement.isInvisibleAnnotationPresent(ctMethod, annotation);
+         CtConstructor ctConstructor = ReflectToJavassist.constructorToJavassist(con);
+         return ctConstructor != null && AnnotationElement.
+            isInvisibleAnnotationPresent(ctConstructor, annotation);
       }
       else
          return false;
@@ -279,8 +282,9 @@
          return true;
       if(includeInvisibleAnnotation(annotation))
       {
-         CtConstructor ctMethod = ReflectToJavassist.constructorToJavassist(con);
-         return AnnotationElement.isAnyAnnotationPresent(ctMethod, annotation);
+         CtConstructor ctConstructor = ReflectToJavassist.constructorToJavassist(con);
+         return ctConstructor != null && AnnotationElement.
+            isAnyAnnotationPresent(ctConstructor, annotation);
       }
       else
          return false;
@@ -468,8 +472,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);
@@ -495,6 +503,10 @@
       try
       {
          CtField ctField = ReflectToJavassist.fieldToJavassist(field);
+         if (ctField == null)
+         {
+            return null;
+         }
          FieldInfo mi = ctField.getFieldInfo2();
 
 
@@ -596,8 +608,9 @@
       }
       if(includeInvisibleAnnotation(annotation))
       {
-         CtField ctMethod = ReflectToJavassist.fieldToJavassist(field);
-         return isInvisibleAnnotationPresent(ctMethod, annotation.getName());
+         CtField ctField = ReflectToJavassist.fieldToJavassist(field);
+         return ctField != null && 
+            isInvisibleAnnotationPresent(ctField, annotation.getName());
       }
       else
          return false;
@@ -635,8 +648,9 @@
       }
       if(includeInvisibleAnnotation(annotation))
       {
-         CtConstructor ctMethod = ReflectToJavassist.constructorToJavassist(con);
-         return isVisibleAnnotationPresent(ctMethod, annotation.getName());
+         CtConstructor ctConstructor = ReflectToJavassist.constructorToJavassist(con);
+         return ctConstructor != null &&
+            isVisibleAnnotationPresent(ctConstructor, annotation.getName());
       }
       else
          return false;