From e430db40aa316a8525974aa64f9aee107b4a5a28 Mon Sep 17 00:00:00 2001
From: Keaton Taylor <keatay@amazon.com>
Date: Thu, 30 Nov 2023 10:05:08 +0200
Subject: [PATCH] Update XMLParserConfiguration to not be static and add a
 comment about the use of shouldTrimWhiteSpace

---
 src/main/java/org/json/XMLParserConfiguration.java | 7 +++++++
 src/main/java/org/json/XMLTokener.java             | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/XMLParserConfiguration.java
index 9682d03..b87a308 100644
--- a/src/main/java/org/json/XMLParserConfiguration.java
+++ b/src/main/java/org/json/XMLParserConfiguration.java
@@ -61,6 +61,13 @@ public class XMLParserConfiguration extends ParserConfiguration {
      */
     private Set<String> forceList;
 
+
+    /**
+     * Flag to indicate whether white space should be trimmed when parsing XML.
+     * The default behaviour is to trim white space. When this is set to false, inputting XML
+     * with tags that are the same as the value of cDataTagName is unsupported. It is recommended to set cDataTagName
+     * to a distinct value in this case.
+     */
     private boolean shouldTrimWhiteSpace;
 
     /**
diff --git a/src/main/java/org/json/XMLTokener.java b/src/main/java/org/json/XMLTokener.java
index eb77e64..4b03f97 100644
--- a/src/main/java/org/json/XMLTokener.java
+++ b/src/main/java/org/json/XMLTokener.java
@@ -20,7 +20,7 @@ public class XMLTokener extends JSONTokener {
     */
    public static final java.util.HashMap<String, Character> entity;
 
-   private static XMLParserConfiguration configuration = XMLParserConfiguration.ORIGINAL;;
+   private XMLParserConfiguration configuration = XMLParserConfiguration.ORIGINAL;;
 
    static {
        entity = new java.util.HashMap<String, Character>(8);
@@ -49,11 +49,11 @@ public class XMLTokener extends JSONTokener {
 
     public XMLTokener(Reader r, XMLParserConfiguration configuration) {
         super(r);
-        XMLTokener.configuration = configuration;
+        this.configuration = configuration;
     }
     public XMLTokener(String s, XMLParserConfiguration configuration) {
         super(s);
-        XMLTokener.configuration = configuration;
+        this.configuration = configuration;
     }
 
     /**