You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2017/08/01 17:43:49 UTC

svn commit: r1803673 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java

Author: tilman
Date: Tue Aug  1 17:43:49 2017
New Revision: 1803673

URL: http://svn.apache.org/viewvc?rev=1803673&view=rev
Log:
PDFBOX-2852: remove unneeded nullcheck; improve javadoc

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

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java?rev=1803673&r1=1803672&r2=1803673&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java Tue Aug  1 17:43:49 2017
@@ -378,7 +378,7 @@ public class COSDocument extends COSBase
     /**
      * This will get a list of all available objects.
      *
-     * @return A list of all objects.
+     * @return A list of all objects, never null.
      */
     public List<COSObject> getObjects()
     {
@@ -427,19 +427,15 @@ public class COSDocument extends COSBase
     @Override
     public void close() throws IOException
     {
-        if (!closed) 
+        if (!closed)
         {
             // close all open I/O streams
-            List<COSObject> list = getObjects();
-            if (list != null) 
+            for (COSObject object : getObjects())
             {
-                for (COSObject object : list) 
+                COSBase cosObject = object.getObject();
+                if (cosObject instanceof COSStream)
                 {
-                    COSBase cosObject = object.getObject();
-                    if (cosObject instanceof COSStream)
-                    {
-                        ((COSStream)cosObject).close();
-                    }
+                    ((COSStream) cosObject).close();
                 }
             }
             for (COSStream stream : streams)