(jackrabbit-oak) branch 1.22 updated: OAK-10644: JsopBuilder: remove JDK6ism (#1304)

[reschke]

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/1.22 by this push:
     new 7110202d5a OAK-10644: JsopBuilder: remove JDK6ism (#1304)
7110202d5a is described below

commit 7110202d5af18e1faccfe8fb3d2fbdc857280173
Author: Julian Reschke <resc...@apache.org>
AuthorDate: Tue Feb 13 13:08:37 2024 +0100

    OAK-10644: JsopBuilder: remove JDK6ism (#1304)
---
 .../main/java/org/apache/jackrabbit/oak/commons/json/JsopBuilder.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/JsopBuilder.java
 
b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/JsopBuilder.java
index 64241a6408..370113b8af 100644
--- 
a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/JsopBuilder.java
+++ 
b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/JsopBuilder.java
@@ -322,8 +322,7 @@ public class JsopBuilder implements JsopWriter {
             default:
                 if (c < ' ') {
                     buff.append(String.format("\\u%04x", (int) c));
-                } else if (c >= 0xd800 && c <= 0xdbff) {
-                    // isSurrogate(), only available in Java 7
+                } else if (Character.isSurrogate(c)) {
                     if (i < length - 1 && Character.isSurrogatePair(c, 
s.charAt(i + 1))) {
                         // ok surrogate
                         buff.append(c);