Merge pull request #1553 from AzureAD/adjoh/make-patterns-constant

Don't recompile patterns unneccesarily.
AzureAD · Aug 18, 2020 · 5e7e61e · 5e7e61e
2 parents e85b49c + 359b7df
commit 5e7e61e
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/adal/src/main/java/com/microsoft/aad/adal/AuthenticationParameters.java b/adal/src/main/java/com/microsoft/aad/adal/AuthenticationParameters.java
@@ -289,7 +289,7 @@ private static final class Challenge {
         /**
          * Regex sequence to parse schemes from WWW-Authenticate header values.
          */
-        private static final String REGEX_STRING_TOKEN_WITH_SCHEME = "^([^\\s|^=]+)[\\s|\\t]+([^=]*=[^=]*)+$";
+        private static final Pattern REGEX_STRING_TOKEN_WITH_SCHEME = Pattern.compile("^([^\\s|^=]+)[\\s|\\t]+([^=]*=[^=]*)+$");
 
         /**
          * Comma+space suffix used to preserve formatting during parsing.
@@ -601,8 +601,7 @@ private static boolean containsScheme(final String token) throws ResourceAuthent
             }
 
             Logger.i(TAG + methodName, "Testing token contains scheme", "input[" + token + "]");
-            final Pattern startWithScheme = Pattern.compile(REGEX_STRING_TOKEN_WITH_SCHEME);
-            final Matcher matcher = startWithScheme.matcher(token);
+            final Matcher matcher = REGEX_STRING_TOKEN_WITH_SCHEME.matcher(token);
             final boolean match = matcher.matches();
             Logger.i(TAG + methodName, "Testing String contains scheme", "Matches? [" + match + "]");
             return match;