svn commit: r1932940 - pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos

[msahyoun]

Author: msahyoun
Date: Fri Apr 10 06:09:48 2026
New Revision: 1932940

Log:
PDFBOX-5660: improve createOutputStream further; add Sonar exception after 
review

Modified:
   pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java      
Fri Apr 10 04:20:05 2026        (r1932939)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java      
Fri Apr 10 06:09:48 2026        (r1932940)
@@ -214,6 +214,7 @@ public class COSStream extends COSDictio
      * @return OutputStream for un-encoded stream data.
      * @throws IOException If the output stream could not be created.
      */
+    @SuppressWarnings("java:S2095") // Intermediate OutputStream ownership is 
transferred to the returned FilterOutputStream
     public OutputStream createOutputStream(COSBase filters) throws IOException
     {
         checkClosed();
@@ -230,16 +231,18 @@ public class COSStream extends COSDictio
             randomAccess.clear();
         else
             randomAccess = getStreamCache().createBuffer();
+
         OutputStream randomOut = null;
+        OutputStream cosOut = null;
 
         try
         {
             randomOut = new RandomAccessOutputStream(randomAccess);
+            cosOut = new COSOutputStream(getFilterList(), this, randomOut, 
getStreamCache());
+            randomOut = null; // ownership transferred to cosOut so don't 
close it in the finally block
 
-            OutputStream cosOut = new COSOutputStream(getFilterList(), this, 
randomOut,
-                    getStreamCache());
-            isWriting = true;
-            FilterOutputStream result = new FilterOutputStream(cosOut)
+            final OutputStream cosOutFinal = cosOut;
+            FilterOutputStream result = new FilterOutputStream(cosOutFinal)
             {
                 @Override
                 public void write(byte[] b, int off, int len) throws 
IOException
@@ -250,21 +253,25 @@ public class COSStream extends COSDictio
                 @Override
                 public void close() throws IOException
                 {
-                    super.close();
-                    setInt(COSName.LENGTH, (int)randomAccess.length());
-                    isWriting = false;
+                    try
+                    {
+                        super.close();
+                        setInt(COSName.LENGTH, (int)randomAccess.length());
+                    }
+                    finally
+                    {
+                        isWriting = false;
+                    }
                 }
             };
-            randomOut = null; // ownership transferred to result, so don't 
close it in the finally block
+            isWriting = true;
+            cosOut = null; // ownership transferred to result, so don't close 
it in the finally block
             return result;
         }
         finally
         {
-            if (randomOut != null)
-            {
-                // clean up partially written data
-                randomOut.close();
-            }
+            if (cosOut != null) cosOut.close();
+            if (randomOut != null) randomOut.close();
         }
     }