From: Maxim Valyanskiy <maxcom@apache.org>
Date: Tue, 20 Mar 2012 11:21:23 +0000 (+0000)
Subject: OPC: add original IOException to chain on open file errors
X-Git-Tag: 3.10-beta1~208
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9fb8683aa383e26a741b19213699452a3dcecc17;p=poi.git

OPC: add original IOException to chain on open file errors

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1302840 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java b/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java
index a2538a6d19..7a8338ed81 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java
+++ b/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java
@@ -25,4 +25,8 @@ public class InvalidOperationException extends OpenXML4JRuntimeException{
 	public InvalidOperationException(String message){
 		super(message);
 	}
+
+    public InvalidOperationException(String message, Throwable reason){
+   		super(message, reason);
+   	}
 }
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
index bc65412bc7..5ac16d3a0b 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
@@ -98,10 +98,15 @@ public final class ZipPackage extends Package {
 	ZipPackage(String path, PackageAccess access) {
 		super(access);
 
-		ZipFile zipFile = ZipHelper.openZipFile(path);
-		if (zipFile == null)
-			throw new InvalidOperationException(
-					"Can't open the specified file: '" + path + "'");
+        ZipFile zipFile = null;
+
+        try {
+            zipFile = ZipHelper.openZipFile(path);
+        } catch (IOException e) {
+            throw new InvalidOperationException(
+         					"Can't open the specified file: '" + path + "'", e);
+        }
+
 		this.zipArchive = new ZipFileZipEntrySource(zipFile);
 	}
 
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
index cbfd5a7ee5..e808dc61e9 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
@@ -148,15 +148,13 @@ public final class ZipHelper {
 	 *            The file path.
 	 * @return The zip archive freshly open.
 	 */
-	public static ZipFile openZipFile(String path) {
+	public static ZipFile openZipFile(String path) throws IOException {
 		File f = new File(path);
-		try {
-			if (!f.exists()) {
-				return null;
-			}
-			return new ZipFile(f);
-		} catch (IOException ioe) {
+
+		if (!f.exists()) {
 			return null;
 		}
+
+		return new ZipFile(f);
 	}
 }