svn commit: r1631247 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java

[ti...@apache.org]

Author: tilman
Date: Sun Oct 12 20:00:44 2014
New Revision: 1631247

URL: http://svn.apache.org/r1631247
Log:
PDFBOX-2424: return null if meta is not a COSStream; code cleanup

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java?rev=1631247&r1=1631246&r2=1631247&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java Sun Oct 12 20:00:44 2014
@@ -51,8 +51,8 @@ import org.apache.pdfbox.pdmodel.interac
  */
 public class PDDocumentCatalog implements COSObjectable
 {
-    private COSDictionary root;
-    private PDDocument document;
+    private final COSDictionary root;
+    private final PDDocument document;
 
     private PDAcroForm acroForm = null;
 
@@ -141,6 +141,7 @@ public class PDDocumentCatalog implement
      *
      * @return The cos object that matches this Java object.
      */
+    @Override
     public COSBase getCOSObject()
     {
         return root;
@@ -309,10 +310,10 @@ public class PDDocumentCatalog implement
     public PDMetadata getMetadata()
     {
         PDMetadata retval = null;
-        COSStream stream = (COSStream)root.getDictionaryObject( COSName.METADATA );
-        if( stream != null )
+        COSBase metaObj = root.getDictionaryObject(COSName.METADATA);
+        if (metaObj instanceof COSStream)
         {
-            retval = new PDMetadata( stream );
+            retval = new PDMetadata((COSStream) metaObj);
         }
         return retval;
     }