This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 00147b6ca0 Avoid problematic syntax for javacc
00147b6ca0 is described below
commit 00147b6ca089a6d2fd2ec603d10c7d5e6ea7c713
Author: remm <[email protected]>
AuthorDate: Wed Sep 16 11:23:22 2026 +0200
Avoid problematic syntax for javacc
---
java/org/apache/tomcat/util/json/JSONParser.java | 31 +++++++++++++++---------
java/org/apache/tomcat/util/json/JSONParser.jjt | 31 +++++++++++++++---------
2 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/java/org/apache/tomcat/util/json/JSONParser.java
b/java/org/apache/tomcat/util/json/JSONParser.java
index c9aec0334c..36f497e3b5 100644
--- a/java/org/apache/tomcat/util/json/JSONParser.java
+++ b/java/org/apache/tomcat/util/json/JSONParser.java
@@ -91,18 +91,25 @@ public class JSONParser implements JSONParserConstants {
continue;
}
char next = value.charAt(++i);
- if (next == 'b') {
- result.append('\b');
- } else if (next == 'f') {
- result.append('\f');
- } else if (next == 'n') {
- result.append('\n');
- } else if (next == 'r') {
- result.append('\r');
- } else if (next == 't') {
- result.append('\t');
- } else {
- result.append(next);
+ switch (next) {
+ case 'b':
+ result.append('\b');
+ break;
+ case 'f':
+ result.append('\f');
+ break;
+ case 'n':
+ result.append('\n');
+ break;
+ case 'r':
+ result.append('\r');
+ break;
+ case 't':
+ result.append('\t');
+ break;
+ default:
+ result.append(next);
+ break;
}
}
return result.toString();
diff --git a/java/org/apache/tomcat/util/json/JSONParser.jjt
b/java/org/apache/tomcat/util/json/JSONParser.jjt
index c8ca7f6f8c..dd85bebe4f 100644
--- a/java/org/apache/tomcat/util/json/JSONParser.jjt
+++ b/java/org/apache/tomcat/util/json/JSONParser.jjt
@@ -122,18 +122,25 @@ public class JSONParser {
continue;
}
char next = value.charAt(++i);
- if (next == 'b') {
- result.append('\b');
- } else if (next == 'f') {
- result.append('\f');
- } else if (next == 'n') {
- result.append('\n');
- } else if (next == 'r') {
- result.append('\r');
- } else if (next == 't') {
- result.append('\t');
- } else {
- result.append(next);
+ switch (next) {
+ case 'b':
+ result.append('\b');
+ break;
+ case 'f':
+ result.append('\f');
+ break;
+ case 'n':
+ result.append('\n');
+ break;
+ case 'r':
+ result.append('\r');
+ break;
+ case 't':
+ result.append('\t');
+ break;
+ default:
+ result.append(next);
+ break;
}
}
return result.toString();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
