You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2014/06/06 22:12:57 UTC
svn commit: r1600996 -
/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
Author: tallison
Date: Fri Jun 6 20:12:57 2014
New Revision: 1600996
URL: http://svn.apache.org/r1600996
Log:
fix potential null pointer exception in PDFParser; found while working on TIKA-1302
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java?rev=1600996&r1=1600995&r2=1600996&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java Fri Jun 6 20:12:57 2014
@@ -239,11 +239,13 @@ public class PDFParser extends AbstractP
XMPSchemaPDFAId pdfaxmp = (XMPSchemaPDFAId) xmp.getSchemaByClass(XMPSchemaPDFAId.class);
if( pdfaxmp != null ) {
metadata.set("pdfaid:part", Integer.toString(pdfaxmp.getPart()));
- metadata.set("pdfaid:conformance", pdfaxmp.getConformance());
- String version = "A-"+pdfaxmp.getPart()+pdfaxmp.getConformance().toLowerCase();
- metadata.set("pdfa:PDFVersion", version );
- metadata.add(TikaCoreProperties.FORMAT.getName(),
- MEDIA_TYPE.toString()+"; version=\""+version+"\"" );
+ if (pdfaxmp.getConformance() != null) {
+ metadata.set("pdfaid:conformance", pdfaxmp.getConformance());
+ String version = "A-"+pdfaxmp.getPart()+pdfaxmp.getConformance().toLowerCase();
+ metadata.set("pdfa:PDFVersion", version );
+ metadata.add(TikaCoreProperties.FORMAT.getName(),
+ MEDIA_TYPE.toString()+"; version=\""+version+"\"" );
+ }
}
// TODO WARN if this XMP version is inconsistent with document header version?
}