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 2019/11/03 18:06:41 UTC
svn commit: r1869340 - in
/pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox:
cos/COSObject.java cos/ICOSParser.java pdfparser/COSParser.java
Author: lehmi
Date: Sun Nov 3 18:06:40 2019
New Revision: 1869340
URL: http://svn.apache.org/viewvc?rev=1869340&view=rev
Log:
PDFBOX-4569: add throws clause to interface method
Modified:
pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java
pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/cos/ICOSParser.java
pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
Modified: pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java?rev=1869340&r1=1869339&r2=1869340&view=diff
==============================================================================
--- pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java (original)
+++ pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java Sun Nov 3 18:06:40 2019
@@ -18,6 +18,9 @@ package org.apache.pdfbox.cos;
import java.io.IOException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* This class represents a PDF object.
*
@@ -32,6 +35,8 @@ public class COSObject extends COSBase i
private boolean needToBeUpdated;
private ICOSParser parser;
+ private static final Log LOG = LogFactory.getLog(COSObject.class);
+
/**
* Constructor.
*
@@ -101,17 +106,22 @@ public class COSObject extends COSBase i
*/
public COSBase getObject()
{
- if (baseObject == null || baseObject instanceof COSNull)
+ if ((baseObject == null || baseObject instanceof COSNull) && parser != null)
{
- if (parser != null)
+ try
{
- boolean returnValue = parser.dereferenceCOSObject(this);
- if (!returnValue)
+ if (!parser.dereferenceCOSObject(this))
{
// remove parser to avoid endless recursions
parser = null;
}
}
+ catch (IOException e)
+ {
+ // remove parser to avoid endless recursions
+ parser = null;
+ LOG.error("Can't dereference " + this, e);
+ }
}
return baseObject;
}
Modified: pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/cos/ICOSParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/cos/ICOSParser.java?rev=1869340&r1=1869339&r2=1869340&view=diff
==============================================================================
--- pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/cos/ICOSParser.java (original)
+++ pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/cos/ICOSParser.java Sun Nov 3 18:06:40 2019
@@ -16,6 +16,8 @@
*/
package org.apache.pdfbox.cos;
+import java.io.IOException;
+
public interface ICOSParser
{
@@ -25,7 +27,9 @@ public interface ICOSParser
* @param obj the COSObject which references the COSBase object to be dereferenced.
*
* @return true if the referenced object was read successfully
+ *
+ * @throws IOException if something went wrong when dereferencing the COSBase object
*/
- public boolean dereferenceCOSObject(COSObject obj);
+ public boolean dereferenceCOSObject(COSObject obj) throws IOException;
}
Modified: pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java?rev=1869340&r1=1869339&r2=1869340&view=diff
==============================================================================
--- pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java (original)
+++ pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java Sun Nov 3 18:06:40 2019
@@ -574,39 +574,15 @@ public class COSParser extends BaseParse
}
@Override
- public boolean dereferenceCOSObject(COSObject obj)
+ public boolean dereferenceCOSObject(COSObject obj) throws IOException
{
- COSBase parsedObj = null;
- long currentPos = 0;
- try
+ long currentPos = source.getPosition();
+ COSBase parsedObj = parseObjectDynamically(obj, false);
+ if (currentPos > 0)
{
- currentPos = source.getPosition();
- parsedObj = parseObjectDynamically(obj, false);
+ source.seek(currentPos);
}
- catch (IOException e)
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- finally
- {
- if (currentPos > 0)
- try
- {
- source.seek(currentPos);
- }
- catch (IOException e)
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- if (parsedObj != null)
- {
- obj.setObject(parsedObj);
- return true;
- }
- return false;
+ return parsedObj != null;
}
/**