deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gpetra...@apache.org
Subject deltaspike git commit: DELTASPIKE-828 improved cycle detection and tests for SecurityUtils#getAllAnnotations
Date Sat, 31 Jan 2015 21:07:07 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master 4604814f9 -> 48cb0ec8a


DELTASPIKE-828 improved cycle detection and tests for SecurityUtils#getAllAnnotations


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/48cb0ec8
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/48cb0ec8
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/48cb0ec8

Branch: refs/heads/master
Commit: 48cb0ec8a1976096195bb2aae471c3be0bfb4787
Parents: 4604814
Author: gpetracek <gpetracek@apache.org>
Authored: Sat Jan 31 22:03:51 2015 +0100
Committer: gpetracek <gpetracek@apache.org>
Committed: Sat Jan 31 22:03:51 2015 +0100

----------------------------------------------------------------------
 .../org/apache/deltaspike/core/util/ReflectionUtils.java    | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/48cb0ec8/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ReflectionUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ReflectionUtils.java
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ReflectionUtils.java
index b30f953..baab6a5 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ReflectionUtils.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ReflectionUtils.java
@@ -403,15 +403,10 @@ public abstract class ReflectionUtils
         return rawType != null && rawType.isPrimitive();
     }
 
-    public static int calculateHashCodeOfAnnotation(Annotation annotation, boolean ignoreNonbindingMembers)
+    public static int calculateHashCodeOfAnnotation(Annotation annotation, boolean skipNonbindingMembers)
     {
         Class annotationClass = annotation.annotationType();
 
-        if (annotationClass == null)
-        {
-            return calculateHashCodeOfType(annotation.annotationType());
-        }
-
         // the hashCode of an Annotation is calculated solely via the hashCodes
         // of it's members. If there are no members, it is 0.
         // thus we first need to get the annotation-class hashCode
@@ -425,7 +420,7 @@ public abstract class ReflectionUtils
 
         for (Method member : members)
         {
-            if (ignoreNonbindingMembers && member.isAnnotationPresent(Nonbinding.class))
+            if (skipNonbindingMembers && member.isAnnotationPresent(Nonbinding.class))
             {
                 // ignore the non binding
                 continue;


Mime
View raw message