Author: nick
Date: Thu Apr 24 14:50:52 2014
New Revision: 1589756
URL: http://svn.apache.org/r1589756
Log:
Correct an eclipse warning around close(), and a related bug that this
identified
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java?rev=1589756&r1=1589755&r2=1589756&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java Thu
Apr 24 14:50:52 2014
@@ -403,6 +403,11 @@ public abstract class OPCPackage impleme
revert();
return;
}
+ if (this.contentTypeManager == null) {
+ logger.log(POILogger.WARN,
+ "Unable to call close() on a package that hasn't
been fully opened yet");
+ return;
+ }
// Save the content
ReentrantReadWriteLock l = new ReentrantReadWriteLock();
Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java?rev=1589756&r1=1589755&r2=1589756&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java Thu
Apr 24 14:50:52 2014
@@ -64,6 +64,10 @@ public final class ZipPackage extends Pa
public ZipPackage() {
super(defaultPackageAccess);
this.zipArchive = null;
+
+ try {
+ this.contentTypeManager = new ZipContentTypeManager(null, this);
+ } catch (InvalidFormatException e) {}
}
/**
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java?rev=1589756&r1=1589755&r2=1589756&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
Thu Apr 24 14:50:52 2014
@@ -73,7 +73,7 @@ public class XWPFWordExtractor extends P
public static void main(String[] args) throws Exception {
if(args.length < 1) {
System.err.println("Use:");
- System.err.println(" HXFWordExtractor
<filename.docx>");
+ System.err.println(" XWPFWordExtractor
<filename.docx>");
System.exit(1);
}
POIXMLTextExtractor extractor =
@@ -81,6 +81,7 @@ public class XWPFWordExtractor extends P
args[0]
));
System.out.println(extractor.getText());
+ extractor.close();
}
public String getText() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
