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-1014 improved meta-data-extraction
Date Thu, 29 Oct 2015 06:44:04 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master 6e71e140b -> 68eabcd33


DELTASPIKE-1014 improved meta-data-extraction


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

Branch: refs/heads/master
Commit: 68eabcd337ca5aecebec2577c0922f5310ba6c4b
Parents: 6e71e14
Author: gpetracek <gpetracek@apache.org>
Authored: Thu Oct 29 07:36:43 2015 +0100
Committer: gpetracek <gpetracek@apache.org>
Committed: Thu Oct 29 07:36:43 2015 +0100

----------------------------------------------------------------------
 .../impl/authorization/SecuredAnnotationAuthorizer.java         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/68eabcd3/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/authorization/SecuredAnnotationAuthorizer.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/authorization/SecuredAnnotationAuthorizer.java
b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/authorization/SecuredAnnotationAuthorizer.java
index 6f004f4..4ece4bb 100644
--- a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/authorization/SecuredAnnotationAuthorizer.java
+++ b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/authorization/SecuredAnnotationAuthorizer.java
@@ -84,10 +84,11 @@ public class SecuredAnnotationAuthorizer
 
         Method method = invocationContext.getMethod();
 
-        result.addAll(SecurityUtils.getAllAnnotations(method.getAnnotations(),
-            new HashSet<Integer>()));
         result.addAll(SecurityUtils.getAllAnnotations(method.getDeclaringClass().getAnnotations(),
             new HashSet<Integer>()));
+        //later on method-level annotations need to overrule class-level annotations ->
don't change the order
+        result.addAll(SecurityUtils.getAllAnnotations(method.getAnnotations(),
+                new HashSet<Integer>()));
 
         return result;
     }


Mime
View raw message