commit 6dbf49738607b107497e89b483bacf905337c7bb
author Gary Gregory <garydgregory@gmail.com> Sat Jan 27 17:36:56 2024 -0500
committer Gary Gregory <garydgregory@gmail.com> Sat Jan 27 17:36:56 2024 -0500
tree 87283e4528090221a76270952556a17281b8f642
parent b5de1f755ef1c714e47a17c792d02a872f012bd9

RandomAccessFileInputStream.builder().get() now throws ISE instead of
NPE

src/changes/changes.xml

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4fcbcdc..4fd5b2a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -102,6 +102,7 @@
       <action dev="ggregory" type="fix"                due-to="Gary Gregory">Deprecate RandomAccessFiles 0-argument constructor.</action>
       <action dev="ggregory" type="fix"                due-to="Elliotte Rusty Harold, Gary Gregory">Clarify and correct EndianUtils and SwappedDataInputStream API doc #566.</action>
       <action dev="ggregory" type="fix"                due-to="Elliotte Rusty Harold">Add characterization test for copying a symlinked directory #570.</action>
+      <action dev="ggregory" type="fix"                due-to="Gary Gregory">RandomAccessFileInputStream.builder().get() now throws ISE instead of NPE.</action>
       <!-- Add -->
       <action dev="ggregory" type="add"                due-to="Gary Gregory">Add and use PathUtils.getFileName(Path, Function&lt;Path, R&gt;).</action>
       <action dev="ggregory" type="add"                due-to="Gary Gregory">Add and use PathUtils.getFileNameString().</action>

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

diff --git a/src/main/java/org/apache/commons/io/input/RandomAccessFileInputStream.java b/src/main/java/org/apache/commons/io/input/RandomAccessFileInputStream.java
index 647ee4d..07a8a97 100644
--- a/src/main/java/org/apache/commons/io/input/RandomAccessFileInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/RandomAccessFileInputStream.java
@@ -79,7 +79,7 @@
                 }
                 return new RandomAccessFileInputStream(randomAccessFile, closeOnClose);
             }
-            return new RandomAccessFileInputStream(RandomAccessFileMode.READ_ONLY.create(getOrigin().getFile()), closeOnClose);
+            return new RandomAccessFileInputStream(RandomAccessFileMode.READ_ONLY.create(checkOrigin().getFile()), closeOnClose);
         }
 
         /**

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

diff --git a/src/test/java/org/apache/commons/io/input/RandomAccessFileInputStreamTest.java b/src/test/java/org/apache/commons/io/input/RandomAccessFileInputStreamTest.java
index 80137c9..0892d3a 100644
--- a/src/test/java/org/apache/commons/io/input/RandomAccessFileInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/RandomAccessFileInputStreamTest.java
@@ -74,6 +74,12 @@
         }
     }
 
+    @Test
+    public void testBuilderGet() {
+        // java.lang.IllegalStateException: origin == null
+        assertThrows(IllegalStateException.class, () -> RandomAccessFileInputStream.builder().get());
+    }
+
     @SuppressWarnings("resource") // instance variable access
     @Test
     public void testBuilderPath() throws IOException {