Changeset 1555 for trunk/docx4j/src/main/java/org/docx4j/openpackaging

Timestamp:

06/22/11 01:36:38 (11 months ago)

Author:

jharrop

Message:

Apply Dave Brown's "assorted patches" of 28 April, as described at
 http://dev.plutext.org/forums/docx-java-f6/assorted-patches-t712.html

Location:

trunk/docx4j/src/main/java/org/docx4j/openpackaging

Files:

• io/LoadFromZipNG.java (modified) (5 diffs)
• parts/XmlPart.java (modified) (4 diffs)

trunk/docx4j/src/main/java/org/docx4j/openpackaging/io/LoadFromZipNG.java

@@ -425 +425 @@
                 String relationshipType = r.getType();          
                         
-                Part part = getRawPart(partByteArrays, ctm, resolvedPartUri, r);
+                Part part = getRawPart(partByteArrays, ctm, resolvedPartUri, r); // will throw exception if null
+
                 if (part instanceof BinaryPart
                                 || part instanceof DefaultXmlPart) {
@@ -492 +493 @@
          * @see  To get a Part and all its related parts, and add all to a package, use
          * getPart.
-         * @param zf
+         * @param partByteArrays
+         * @param ctm
          * @param resolvedPartUri
+         * @param rel
          * @return
-         * @throws URISyntaxException
-         * @throws InvalidFormatException
+         * @throws Docx4JException including if result is null
          */
-        //public static Part getRawPart(ZipFile zf, ContentTypeManager ctm, String resolvedPartUri)
         public static Part getRawPart(HashMap<String, ByteArray> partByteArrays,
                         ContentTypeManager ctm, String resolvedPartUri, Relationship rel)       
@@ -617 +618 @@
                                 } else if (part instanceof org.docx4j.openpackaging.parts.XmlPart ) {
                                         
-                                        try {
+//                                      try {
                                                 ((XmlPart)part).setDocument(is);
-                                        } catch (Docx4JException d) {
-                                                // This isn't an XML part after all,
-                                                // even though ContentTypeManager detected it as such
-                                                // So get it as a binary part
-                                                part = getBinaryPart(partByteArrays, ctm, resolvedPartUri);
-                                                log.warn("Could not parse as XML, so using BinaryPart for " 
-                                                                + resolvedPartUri);                                             
-                                                ((BinaryPart)part).setBinaryData(is);
-                                        }
+                                                
+                                        // Experimental 22/6/2011; don't fall back to binary (which we used to) 
+                                                
+//                                      } catch (Docx4JException d) {
+//                                              // This isn't an XML part after all,
+//                                              // even though ContentTypeManager detected it as such
+//                                              // So get it as a binary part
+//                                              part = getBinaryPart(partByteArrays, ctm, resolvedPartUri);
+//                                              log.warn("Could not parse as XML, so using BinaryPart for " 
+//                                                              + resolvedPartUri);                                             
+//                                              ((BinaryPart)part).setBinaryData(is);
+//                                      }
                                         
                                 } else {
@@ -639 +643 @@
                         
                         } catch (PartUnrecognisedException e) {
-                                log.warn("PartUnrecognisedException shouldn't happen anymore!");
+                                log.error("PartUnrecognisedException shouldn't happen anymore!", e);
                                 // Try to get it as a binary part
                                 part = getBinaryPart(partByteArrays, ctm, resolvedPartUri);
@@ -660 +664 @@
                         }
                 }
+                
+        if (part == null) {
+            throw new Docx4JException("cannot find part " + resolvedPartUri + " from rel "+ rel.getId() + "=" + rel.getTarget());
+        }
+                
                 return part;
         }

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/XmlPart.java

@@ -70 +70 @@
                 super();
         }
-        
+
         /**
          * This part's XML contents.  Not guaranteed to be up to date.
@@ -80 +80 @@
         private static XPathFactory xPathFactory;
         private static XPath xPath;
-        
+
         private static DocumentBuilderFactory documentFactory;
-        private static DocumentBuilder documentBuilder;
+
         
         static {
@@ -109 +109 @@
                 
                 documentFactory.setNamespaceAware(true);
-                try {
-                        documentBuilder = documentFactory.newDocumentBuilder();
-                } catch (ParserConfigurationException e) {
-                        e.printStackTrace();
-                }               
-                
+
         }
         
@@ -129 +124 @@
         public void setDocument(InputStream is) throws Docx4JException {
                 try {
-                        doc = documentBuilder.parse(is);
+            DocumentBuilder documentBuilder = documentFactory.newDocumentBuilder(); // DocumentBuilder is not thread safe, so it needs to be local 
+            doc = documentBuilder.parse(is);
                 } catch (Exception e) {
                         throw new Docx4JException("Problems parsing InputStream for part " + this.partName.getName(), e);