svn commit: r1425258 - /pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/xml/DomXmpParser.java

[gbailleul]

Author: gbailleul
Date: Sat Dec 22 08:41:44 2012
New Revision: 1425258

URL: http://svn.apache.org/viewvc?rev=1425258&view=rev
Log:
PDFBOX-1476 : fixed rdf problem
fixed NPE on invalid structured type

Modified:
    
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/xml/DomXmpParser.java

Modified: 
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/xml/DomXmpParser.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/xml/DomXmpParser.java?rev=1425258&r1=1425257&r2=1425258&view=diff
==============================================================================
--- 
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/xml/DomXmpParser.java 
(original)
+++ 
pdfbox/trunk/xmpbox/src/main/java/org/apache/padaf/xmpbox/xml/DomXmpParser.java 
Sat Dec 22 08:41:44 2012
@@ -188,6 +188,8 @@ public class DomXmpParser {
 //                                     if (schema instanceof XMPSchema) {
 //                                             
((XMPSchema)sp).setAboutAsSimple(attr.getValue());
 //                                     }
+                               } else if (attr.getPrefix()==null && 
XmpConstants.ABOUT_NAME.equals(attr.getLocalName())) {
+                                       // do nothing
                                } else {
                                        String namespace = 
attr.getNamespaceURI();
                                        XMPSchema schema = 
xmp.getSchema(namespace);
@@ -271,6 +273,9 @@ public class DomXmpParser {
                                        container.addProperty(ast);
                                } else {
                                        Element inner = 
DomHelper.getFirstChildElement(property);
+                                       if (inner==null) {
+                                               throw new 
XmpParsingException(ErrorType.Format, "property should contain child element : 
"+property);
+                                       }
                                        AbstractStructuredType ast = 
parseLiDescription(xmp, DomHelper.getQName(property), inner);
                                        ast.setPrefix(prefix);
                                        container.addProperty(ast);