You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2020/12/14 12:12:35 UTC
svn commit: r1884415 - in /pdfbox/branches/2.0/pdfbox/src:
main/java/org/apache/pdfbox/util/DateConverter.java
test/java/org/apache/pdfbox/util/TestDateUtil.java
Author: tilman
Date: Mon Dec 14 12:12:35 2020
New Revision: 1884415
URL: http://svn.apache.org/viewvc?rev=1884415&view=rev
Log:
PDFBOX-5046: catch more empty dates
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/util/DateConverter.java
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/util/TestDateUtil.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/util/DateConverter.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/util/DateConverter.java?rev=1884415&r1=1884414&r2=1884415&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/util/DateConverter.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/util/DateConverter.java Mon Dec 14 12:12:35 2020
@@ -615,7 +615,7 @@ public final class DateConverter
*/
private static Calendar parseDate(String text, ParsePosition initialWhere)
{
- if (text == null || text.isEmpty())
+ if (text == null || text.isEmpty() || "D:".equals(text.trim()))
{
return null;
}
Modified: pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/util/TestDateUtil.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/util/TestDateUtil.java?rev=1884415&r1=1884414&r2=1884415&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/util/TestDateUtil.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/util/TestDateUtil.java Mon Dec 14 12:12:35 2020
@@ -339,6 +339,8 @@ public class TestDateUtil extends TestCa
assertNull(DateConverter.toCalendar((COSString) null));
assertNull(DateConverter.toCalendar((String) null));
+ assertNull(DateConverter.toCalendar("D: "));
+ assertNull(DateConverter.toCalendar("D:"));
checkToString(2013, 8, 28, 3, 14, 15, tzPgh, -4, 0);
checkToString(2014, 2, 28, 3, 14, 15, tzPgh, -5, 0);