ReaderInputStream.Builder.setCharset(null) should reset to a default

object, not throw an NPE

Author: garydgregory

src/changes/changes.xml

@@ -73,6 +73,9 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="ggregory" type="fix" due-to="Gary Gregory">
         ReaderInputStream.Builder.setCharsetEncoder(null) should reset to a default object, not throw an NPE.
       </action>
+      <action dev="ggregory" type="fix" due-to="Gary Gregory">
+        ReaderInputStream.Builder.setCharset(null) should reset to a default object, not throw an NPE.
+      </action>
       <!-- ADD -->
       <action dev="ggregory" type="add" due-to="Gary Gregory">
         Add CharSequenceInputStream.Builder.

src/main/java/org/apache/commons/io/build/AbstractStreamBuilder.java

@@ -99,7 +99,7 @@ protected CharSequence getCharSequence() throws IOException {
      *
      * @return the Charset, defaults to {@link Charset#defaultCharset()}.
      */
-    protected Charset getCharset() {
+    public Charset getCharset() {
         return charset;
     }
 

src/main/java/org/apache/commons/io/input/ReaderInputStream.java

@@ -129,8 +129,9 @@ CharsetEncoder getCharsetEncoder() {
 
         @Override
         public Builder setCharset(final Charset charset) {
-            charsetEncoder = charset.newEncoder();
-            return super.setCharset(charset);
+            super.setCharset(charset);
+            charsetEncoder = getCharset().newEncoder();
+            return this;
         }
 
         /**

src/test/java/org/apache/commons/io/input/ReaderInputStreamTest.java

@@ -242,11 +242,21 @@ public void testReadZeroEmptyString() throws Exception {
         }
     }
 
+    @Test
+    public void testResetCharset() {
+        assertNotNull(ReaderInputStream.builder().setReader(new StringReader("\uD800")).setCharset((Charset) null).getCharset());
+    }
+
     @Test
     public void testResetCharsetEncoder() {
         assertNotNull(ReaderInputStream.builder().setReader(new StringReader("\uD800")).setCharsetEncoder(null).getCharsetEncoder());
     }
 
+    @Test
+    public void testResetCharsetName() {
+        assertNotNull(ReaderInputStream.builder().setReader(new StringReader("\uD800")).setCharset((String) null).getCharset());
+    }
+
     @Test
     public void testUTF16WithSingleByteRead() throws IOException {
         testWithSingleByteRead(TEST_STRING, UTF_16);