svn commit: r1683231 - /myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/AuthorizationUtils.java

[lo...@apache.org]

Author: lofwyr
Date: Wed Jun  3 05:09:19 2015
New Revision: 1683231

URL: http://svn.apache.org/r1683231
Log:
TOBAGO-1468: NoSuchMethodException in security module, when using EL 2.0 paranthesis in actions
- performance optimization

Modified:
    myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/AuthorizationUtils.java

Modified: myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/AuthorizationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/AuthorizationUtils.java?rev=1683231&r1=1683230&r2=1683231&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/AuthorizationUtils.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/AuthorizationUtils.java Wed Jun  3 05:09:19 2015
@@ -43,6 +43,8 @@ public class AuthorizationUtils {
   private static final Object NULL_VALUE = new Object();
   private static final Map<String, Object> AUTHORISATION_CACHE = new ConcurrentHashMap<String, Object>();
 
+  private static final Pattern PATTERN = Pattern.compile("#\\{(\\w+(?:\\.\\w+)*)\\.(\\w+)(?:\\(.*\\))?\\}");
+
   private AuthorizationUtils() {
   }
 
@@ -106,8 +108,7 @@ public class AuthorizationUtils {
       return null;
     } else {
       Annotation securityAnnotation = null;
-      final Pattern pattern = Pattern.compile("#\\{(\\w+(?:\\.\\w+)*)\\.(\\w+)(?:\\(.*\\))?\\}");
-      final Matcher matcher = pattern.matcher(expression);
+      final Matcher matcher = PATTERN.matcher(expression);
       if (matcher.matches()) {
         String beanString = matcher.group(1);
         String methodString = matcher.group(2);