WebRequest custom serialization misses the handling of defaultRespons…

…eContentCharset_ (issue #898)
HtmlUnit · Nov 13, 2024 · 82c1292 · 82c1292
1 parent db89887
commit 82c1292
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -8,6 +8,9 @@
 
     <body>
         <release version="4.7.0" date="November xx, 2024" description="Bugfixes">
+            <action type="add" dev="rbri" issue="#898">
+                WebRequest custom serialization misses the handling of defaultResponseContentCharset_.
+            </action>
             <action type="add" dev="Marek Andreansky">
                 Class SilentIncorrectnessListener added.
             </action>

diff --git a/src/main/java/org/htmlunit/WebRequest.java b/src/main/java/org/htmlunit/WebRequest.java
@@ -690,6 +690,7 @@ public String toString() {
     private void writeObject(final ObjectOutputStream oos) throws IOException {
         oos.defaultWriteObject();
         oos.writeObject(charset_ == null ? null : charset_.name());
+        oos.writeObject(defaultResponseContentCharset_ == null ? null : defaultResponseContentCharset_.name());
     }
 
     private void readObject(final ObjectInputStream ois) throws ClassNotFoundException, IOException {
@@ -698,5 +699,9 @@ private void readObject(final ObjectInputStream ois) throws ClassNotFoundExcepti
         if (charsetName != null) {
             charset_ = Charset.forName(charsetName);
         }
+        final String defaultResponseContentCharset = (String) ois.readObject();
+        if (defaultResponseContentCharset != null) {
+            defaultResponseContentCharset_ = Charset.forName(charsetName);
+        }
     }
 }
diff --git a/src/test/java/org/htmlunit/WebRequestTest.java b/src/test/java/org/htmlunit/WebRequestTest.java
@@ -19,7 +19,9 @@
 import static org.junit.Assert.assertNotNull;
 
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 
+import org.apache.commons.lang3.SerializationUtils;
 import org.apache.http.auth.BasicUserPrincipal;
 import org.apache.http.auth.Credentials;
 import org.junit.Test;
@@ -327,4 +329,21 @@ public void getRequestParametersFromUrlEncodedBodyPost() throws Exception {
 
         assertEquals(0, request.getRequestParameters().size());
     }
+
+    /**
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void serialization() throws Exception {
+        final WebRequest request = new WebRequest(URL_FIRST);
+        request.setCharset(StandardCharsets.UTF_8);
+        request.setDefaultResponseContentCharset(StandardCharsets.US_ASCII);
+
+        final byte[] bytes = SerializationUtils.serialize(request);
+        final WebRequest deserialized = (WebRequest) SerializationUtils.deserialize(bytes);
+
+        assertEquals(URL_FIRST, deserialized.getUrl());
+        assertEquals(StandardCharsets.UTF_8, deserialized.getCharset());
+        assertEquals(StandardCharsets.US_ASCII, deserialized.getDefaultResponseContentCharset());
+    }
 }