From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 4 Apr 2022 20:48:14 +0000 (+0200)
Subject: Adjust message parsing to account for JDK-8230338
X-Git-Tag: v8.0.3~13
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F88%2F100388%2F2;p=yangtools.git

Adjust message parsing to account for JDK-8230338

JDK14 changed the error reporting string, which makes our algorithm
fail. Make sure we account for it.

JIRA: YANGTOOLS-1418
Change-Id: Iea9866c6f98508851f0d558d7e2422740e91ef87
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/RegexUtils.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/RegexUtils.java
index 2da907a189..8a2a8fb65c 100644
--- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/RegexUtils.java
+++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/RegexUtils.java
@@ -324,6 +324,9 @@ final class RegexUtils {
             if (capturedGroup.startsWith("In/Is")) {
                 // Java 9 changed the reporting string
                 capturedGroup = capturedGroup.substring(5);
+            } else if (capturedGroup.startsWith("Is")) {
+                // Java 14 changed the reporting string (https://bugs.openjdk.java.net/browse/JDK-8230338)
+                capturedGroup = capturedGroup.substring(2);
             }
 
             if (JAVA_UNICODE_BLOCKS.contains(capturedGroup)) {