You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by gb...@apache.org on 2013/11/30 17:40:05 UTC
svn commit: r1546743 -
/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/PdfaExtensionHelper.java
Author: gbailleul
Date: Sat Nov 30 16:40:04 2013
New Revision: 1546743
URL: http://svn.apache.org/r1546743
Log:
PDFBOX-1642: NPE onClosed Choice
* Fixed NPE, "closed Choice of Text" was not a known type
* Trim namespaces parameter in schema definition (see line 17 of attached xmp)
Modified:
pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/PdfaExtensionHelper.java
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/PdfaExtensionHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/PdfaExtensionHelper.java?rev=1546743&r1=1546742&r2=1546743&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/PdfaExtensionHelper.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/PdfaExtensionHelper.java Sat Nov 30 16:40:04 2013
@@ -112,7 +112,7 @@ public final class PdfaExtensionHelper
if (af instanceof PDFASchemaType)
{
PDFASchemaType st = (PDFASchemaType) af;
- String namespaceUri = st.getNamespaceURI();
+ String namespaceUri = st.getNamespaceURI().trim();
String prefix = st.getPrefixValue();
ArrayProperty properties = st.getProperty();
ArrayProperty valueTypes = st.getValueType();
@@ -240,6 +240,9 @@ public final class PdfaExtensionHelper
return TypeMapping.createPropertyType(Types.LangAlt, Cardinality.Simple);
}
// else all other cases
+ if ("closed Choice of Text".equals(valueType)) {
+ valueType = "Text";
+ }
int pos = valueType.indexOf(' ');
Cardinality card = Cardinality.Simple;
if (pos > 0)