Merge pull request #24817 from kaido207/fix_nonascii_encode

Fixes #24816 Non-ASCII characters are not saved correctly in JVM options added using the JVM Options page
eclipse-ee4j · Feb 20, 2024 · 7a65c43 · 7a65c43
2 parents bb3e535 + 4aa239c
commit 7a65c43
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/...admingui/common/src/main/java/org/glassfish/admingui/common/handlers/SecurityHandler.java b/...admingui/common/src/main/java/org/glassfish/admingui/common/handlers/SecurityHandler.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -277,7 +278,7 @@ public static void saveRealm(HandlerContext handlerCtx) {
                 continue;
             }
             sb.append(oneProp.get("name")).append("=");
-            String value = ((String) oneProp.get("value")).replaceAll("\\\\", "\\\\\\\\");
+            String value = (String) oneProp.get("value");
             value = UtilHandlers.escapePropertyValue(value);
             sb.append(value).append(":");
         }

diff --git a/...er/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java b/...er/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -1094,19 +1095,7 @@ public static String escapePropertyValue(String str){
                     builder.append(ch);
                     break;
                 default:
-                    // Check if we should unicode escape this...
-                    if ((ch > 0x7e) || (ch < 0x20)) {
-                        builder.append("\\u");
-                        chStr = Integer.toHexString(ch);
-                        len = chStr.length();
-                        for (int idx=4; idx > len; idx--) {
-                            // Add leading 0's
-                            builder.append('0');
-                        }
-                        builder.append(chStr);
-                    } else {
-                        builder.append(ch);
-                    }
+                    builder.append(ch);
                     break;
             }
             ch = it.next();