Attachment 229529 Details for Bug 395274 – Additional patch for commit 7591e36abd6786ae4b6a3e57e9d3d07f4be3cad2

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Additional patch for commit 7591e36abd6786ae4b6a3e57e9d3d07f4be3cad2

patch3.patch (text/plain), 1.67 KB, created by Violeta Georgieva

on 2013-04-09 15:03:01 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Violeta Georgieva

Created: 2013-04-09 15:03:01 EDT

Size: 1.67 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirBundleFile.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirBundleFile.java
>index 295a866..8a9ef61 100644
>--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirBundleFile.java
>+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirBundleFile.java
>@@ -31,6 +31,7 @@ public class DirBundleFile extends BundleFile {
> 	private static final String PROPERTY_STRICT_BUNDLE_ENTRY_PATH = "osgi.strictBundleEntryPath";//$NON-NLS-1$
> 	private static final String PROPERTY_STRICT_BUNDLE_ENTRY_PATH_DEFAULT_VALUE = "false";//$NON-NLS-1$
> 
>+	private final String baseFileCanonicalPath;
> 	private final boolean enableStrictBundleEntryPath;
> 
> 	/**
>@@ -43,12 +44,13 @@ public class DirBundleFile extends BundleFile {
> 		if (!BundleFile.secureAction.exists(basefile) || !BundleFile.secureAction.isDirectory(basefile)) {
> 			throw new IOException(NLS.bind(AdaptorMsg.ADAPTOR_DIRECTORY_EXCEPTION, basefile));
> 		}
>+		this.baseFileCanonicalPath = BundleFile.secureAction.getCanonicalPath(basefile);
> 		this.enableStrictBundleEntryPath = Boolean.parseBoolean(BundleFile.secureAction.getProperty(PROPERTY_STRICT_BUNDLE_ENTRY_PATH, PROPERTY_STRICT_BUNDLE_ENTRY_PATH_DEFAULT_VALUE));
> 	}
> 
> 	public File getFile(String path, boolean nativeCode) {
> 		final boolean checkInBundle = path != null && path.indexOf(POINTER_UPPER_DIRECTORY) >= 0;
>-		File file = new File(this.basefile, path);
>+		File file = new File(this.baseFileCanonicalPath, path);
> 		if (!BundleFile.secureAction.exists(file)) {
> 			return null;
> 		}

Actions: View | Diff

Attachments on bug 395274: 224051 | 226730 | 229125 | 229500 | 229529 | 229550