svn commit: r1889592 - /pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java

[tilman]

Author: tilman
Date: Fri May  7 04:47:45 2021
New Revision: 1889592

URL: http://svn.apache.org/viewvc?rev=1889592&view=rev
Log:
PDFBOX-4892: optimize, as suggested by valerybokov

Modified:
    
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java

Modified: 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
URL: 
http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java?rev=1889592&r1=1889591&r2=1889592&view=diff
==============================================================================
--- 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
 (original)
+++ 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
 Fri May  7 04:47:45 2021
@@ -425,7 +425,7 @@ public class PDFMergerUtility
     private void legacyMergeDocuments(MemoryUsageSetting memUsageSetting) 
throws IOException
     {
         PDDocument destination = null;
-        if (sources != null && sources.size() > 0)
+        if (sources.size() > 0)
         {
             // Make sure that:
             // - first Exception is kept
@@ -926,9 +926,13 @@ public class PDFMergerUtility
 
     private void mergeLanguage(PDDocumentCatalog destCatalog, 
PDDocumentCatalog srcCatalog)
     {
-        if (destCatalog.getLanguage() == null && srcCatalog.getLanguage() != 
null)
+        if (destCatalog.getLanguage() == null)
         {
-            destCatalog.setLanguage(srcCatalog.getLanguage());
+            String srcLanguage = srcCatalog.getLanguage();
+            if (srcLanguage != null)
+            {
+                destCatalog.setLanguage(srcLanguage);
+            }
         }
     }
 
@@ -996,11 +1000,11 @@ public class PDFMergerUtility
             PDStructureTreeRoot destStructTree) throws IOException
     {
         PDNameTreeNode<PDStructureElement> srcIDTree = 
srcStructTree.getIDTree();
-        PDNameTreeNode<PDStructureElement> destIDTree = 
destStructTree.getIDTree();
         if (srcIDTree == null)
         {
             return;
         }
+        PDNameTreeNode<PDStructureElement> destIDTree = 
destStructTree.getIDTree();
         if (destIDTree == null)
         {
             destIDTree = new PDStructureElementNameTreeNode();