You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2021/06/13 20:33:32 UTC
svn commit: r1890759 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
Author: lehmi
Date: Sun Jun 13 20:33:32 2021
New Revision: 1890759
URL: http://svn.apache.org/viewvc?rev=1890759&view=rev
Log:
PDFBOX-5170: sonar fix
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=1890759&r1=1890758&r2=1890759&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 Sun Jun 13 20:33:32 2021
@@ -1056,10 +1056,11 @@ public class COSWriter implements ICOSVi
private COSObjectKey getObjectKey( COSBase obj )
{
COSBase actual = obj;
+ COSObjectKey key = null;
if( actual instanceof COSObject )
{
actual = ((COSObject) obj).getObject();
- COSObjectKey key = obj.getKey();
+ key = obj.getKey();
if (key != null)
{
objectKeys.put(obj, key);
@@ -1068,15 +1069,9 @@ public class COSWriter implements ICOSVi
}
// 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;
- if (key == null)
+ if (actual != null)
{
- key = new COSObjectKey(++number, 0);
- objectKeys.put(obj, key);
- if( actual != null )
- {
- objectKeys.put(actual, key);
- }
+ key = objectKeys.computeIfAbsent(actual, k -> new COSObjectKey(++number, 0));
}
return key;
}