Bug 307209 - ZipException missing filename

1 files changed, 19 insertions, 11 deletions

diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/util/SecureAction.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/util/SecureAction.java
index 8376bfc88..6b662afcb 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/util/SecureAction.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/util/SecureAction.java
@@ -15,6 +15,7 @@ import java.io.*;
 import java.net.*;
 import java.security.*;
 import java.util.Properties;
+import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
 import org.eclipse.osgi.framework.internal.core.FrameworkProperties;
 import org.osgi.framework.*;
@@ -245,18 +246,25 @@ public class SecureAction {
 	 * @throws IOException if an error occured
 	 */
 	public ZipFile getZipFile(final File file) throws IOException {
-		if (System.getSecurityManager() == null)
-			return new ZipFile(file);
 		try {
-			return (ZipFile) AccessController.doPrivileged(new PrivilegedExceptionAction() {
-				public Object run() throws IOException {
-					return new ZipFile(file);
-				}
-			}, controlContext);
-		} catch (PrivilegedActionException e) {
-			if (e.getException() instanceof IOException)
-				throw (IOException) e.getException();
-			throw (RuntimeException) e.getException();
+			if (System.getSecurityManager() == null)
+				return new ZipFile(file);
+			try {
+				return (ZipFile) AccessController.doPrivileged(new PrivilegedExceptionAction() {
+					public Object run() throws IOException {
+						return new ZipFile(file);
+					}
+				}, controlContext);
+			} catch (PrivilegedActionException e) {
+				if (e.getException() instanceof IOException)
+					throw (IOException) e.getException();
+				throw (RuntimeException) e.getException();
+			}
+		} catch (IOException e) {
+			IOException fileNameEx = new ZipException("Exception in opening zip file: " + file.getPath()); //$NON-NLS-1$
+			fileNameEx.initCause(e);
+			throw fileNameEx;
+
 		}
 	}