Changeset 1736 for trunk

Timestamp:

12/30/11 03:11:51 (5 months ago)

Author:

jharrop

Message:

Work around for class cast exception in BinderImpl?.unmarshal (copied from MainDocumentPart?).

Location:

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

Files:

• FooterPart.java (modified) (1 diff)
• HeaderPart.java (modified) (1 diff)
• MainDocumentPart.java (modified) (1 diff)

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/FooterPart.java

@@ -200 +200 @@
                                 XmlUtils.transform(doc, mcPreprocessorXslt, null, result);
                                 doc = (org.w3c.dom.Document)result.getNode();
-                                jaxbElement =  (Ftr) binder.unmarshal( doc );                                   
+                                
+                                try {                           
+                                        jaxbElement =  (Ftr) binder.unmarshal( doc );
+                                } catch (ClassCastException cce) {
+                                        // Work around for issue with JAXB binder, in Java 1.6
+                                        // See comments in MainDocumentPart.                                    
+                                        log.warn("Binder not available for this docx");
+                                        Unmarshaller u = jc.createUnmarshaller();
+                                        jaxbElement = (Ftr) u.unmarshal( doc );                                 
+                                }
                         }
                         

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/HeaderPart.java

@@ -191 +191 @@
                                 log.info("encountered unexpected content; pre-processing");
                                 eventHandler.setContinue(true);
+                                
+                                // There is no JAXBResult(binder),
+                                // so use a 
                                 DOMResult result = new DOMResult();
+                                
                                 Templates mcPreprocessorXslt = JaxbValidationEventHandler.getMcPreprocessor();
                                 XmlUtils.transform(doc, mcPreprocessorXslt, null, result);
+                                
                                 doc = (org.w3c.dom.Document)result.getNode();
-                                jaxbElement =  (Hdr) binder.unmarshal( doc );                                   
+                                try {                           
+                                        jaxbElement =  (Hdr) binder.unmarshal( doc );
+                                } catch (ClassCastException cce) {
+                                        // Work around for issue with JAXB binder, in Java 1.6
+                                        // See comments in MainDocumentPart.                                    
+                                        log.warn("Binder not available for this docx");
+                                        Unmarshaller u = jc.createUnmarshaller();
+                                        jaxbElement = (Hdr) u.unmarshal( doc );                                 
+                                }
+                                
+                                
                         }
                         

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/MainDocumentPart.java

@@ -322 +322 @@
                                         jaxbElement =  (org.docx4j.wml.Document) binder.unmarshal( doc );
                                 } catch (ClassCastException cce) {
-                                        // Work around for issue with JAXB binder, in Java 1.6
-                                        // encountered with /src/test/resources/jaxb-binder-issue.docx                                  
+ 
                                         log.warn("Binder not available for this docx");
                                         Unmarshaller u = jc.createUnmarshaller();
                                         jaxbElement = (org.docx4j.wml.Document) u.unmarshal( doc );                                     
-                                        /* java.lang.ClassCastException: org.docx4j.wml.PPr cannot be cast to javax.xml.bind.JAXBElement
+                                        /* 
+                                         * Work around for issue with JAXB binder, in Java 1.6 
+                                         * encountered with /src/test/resources/jaxb-binder-issue.docx 
+                                         * See http://old.nabble.com/BinderImpl.associativeUnmarshal-ClassCastException-casting-to-JAXBElement-td32456585.html
+                                         * 
+                                         * java.lang.ClassCastException: org.docx4j.wml.PPr cannot be cast to javax.xml.bind.JAXBElement
                                                 at com.sun.xml.internal.bind.v2.runtime.ElementBeanInfoImpl$IntercepterLoader.intercept(Unknown Source)
                                                 at com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallingContext.endElement(Unknown Source)