Merging jdk8u332-b09 into release

adoptium · Apr 20, 2022 · c2cdb99 · c2cdb99
2 parents e6d2255 + 3d2fe9b
commit c2cdb99
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/.hgtags b/.hgtags
@@ -1133,3 +1133,4 @@ f58fc9077d2274b2832bc00ff16d112fe99d9ace jdk8u332-b04
 240124add1e91b41760100a44b579529eab5a634 jdk8u332-b06-aarch32-20220405
 429be4b91dd279ec1165794d49efc36ecdbba842 jdk8u332-b07-aarch32-20220420
 6d526dbc3432fd9f2db19bdcb2f6b5b8799d88f0 jdk8u332-b07
+95b31159fdfd496e521e119aba9ef54acf6b272e jdk8u332-b08
diff --git a/jaxp/src/com/sun/java_cup/internal/runtime/lr_parser.java b/jaxp/src/com/sun/java_cup/internal/runtime/lr_parser.java
@@ -389,7 +389,12 @@ public Symbol scan() throws Exception {
   }
 
   private boolean contains(final int[] arr, final int key) {
-    return Arrays.stream(arr).anyMatch(i -> i == key);
+    for (int i = 0 ; i < arr.length ; ++i) {
+      if (arr[i] == key) {
+        return true;
+      }
+    }
+    return false;
   }
 
   /*. . . . . . . . . . . . . . . . . . . . . . . . . . . . . .*/

diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Token.java b/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Token.java
@@ -67,7 +67,12 @@ public final class Token {
         DDOT, DCOLON, ATTR, CHILD};
 
     public static boolean contains(String str) {
-        return Arrays.stream(OPERATORS).anyMatch(str::equals);
+      for (String op : OPERATORS) {
+        if (op.equals(str)) {
+          return true;
+        }
+      }
+      return false;
     }
 
     private Token() {