svn commit: r1890502 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java

[le...@apache.org]

Author: lehmi
Date: Sat Jun  5 12:43:18 2021
New Revision: 1890502

URL: http://svn.apache.org/viewvc?rev=1890502&view=rev
Log:
PDFBOX-5170: revert last changes due to some issue with the overlay test

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java?rev=1890502&r1=1890501&r2=1890502&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java Sat Jun  5 12:43:18 2021
@@ -1064,16 +1064,14 @@ public class COSWriter implements ICOSVi
         if( actual instanceof COSObject )
         {
             actual = ((COSObject)obj).getObject();
-            COSObjectKey key = obj.getKey();
-            if (key != null)
-            {
-                objectKeys.put(obj, key);
-                return key;
-            }
         }
         // PDFBOX-4540: because objectKeys is accessible from outside, it is possible
         // that a COSObject obj is already in the objectKeys map.
-        COSObjectKey key = actual != null ? objectKeys.get(actual) : null;
+        COSObjectKey key = objectKeys.get(obj);
+        if( key == null && actual != null )
+        {
+            key = objectKeys.get(actual);
+        }
         if (key == null)
         {
             key = new COSObjectKey(++number, 0);