You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ad...@apache.org on 2010/08/26 19:41:45 UTC
svn commit: r989838 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java
Author: adam
Date: Thu Aug 26 17:41:45 2010
New Revision: 989838
URL: http://svn.apache.org/viewvc?rev=989838&view=rev
Log:
PDFBOX-796: Objects from streams overwrite objects already read with the same ID/Generation
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=989838&r1=989837&r2=989838&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 Thu Aug 26 17:41:45 2010
@@ -450,8 +450,11 @@ public class COSDocument extends COSBase
for( COSObject next : parser.getObjects() )
{
COSObjectKey key = new COSObjectKey( next );
- COSObject obj = getObjectFromPool( key );
- obj.setObject( next.getObject() );
+ if(objectPool.get(key) == null)
+ {
+ COSObject obj = getObjectFromPool(key);
+ obj.setObject(next.getObject());
+ }
}
}
}