Attachment 189285 Details for Bug 337569 – possible fix

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

[patch] possible fix

337569.txt (text/plain), 1.44 KB, created by Thomas Watson

on 2011-02-18 10:54:01 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Watson

Created: 2011-02-18 10:54:01 EST

Size: 1.44 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.osgi
>Index: defaultAdaptor/src/org/eclipse/osgi/baseadaptor/BaseAdaptor.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/framework/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/BaseAdaptor.java,v
>retrieving revision 1.19
>diff -u -r1.19 BaseAdaptor.java
>--- defaultAdaptor/src/org/eclipse/osgi/baseadaptor/BaseAdaptor.java	17 Feb 2011 14:47:56 -0000	1.19
>+++ defaultAdaptor/src/org/eclipse/osgi/baseadaptor/BaseAdaptor.java	18 Feb 2011 15:52:10 -0000
>@@ -577,9 +577,9 @@
> 		Filter patternFilter = null;
> 		Hashtable<String, String> patternProps = null;
> 		if (filePattern != null) {
>-			// Optimization: If the file pattern does not include a wildcard then it must represent a single file.
>+			// Optimization: If the file pattern does not include a wildcard  or escape  char then it must represent a single file.
> 			// Avoid pattern matching and use BundleFile.getEntry() if recursion was not requested.
>-			if (filePattern.indexOf('*') == -1 && (options & BundleWiring.FINDENTRIES_RECURSE) == 0) {
>+			if ((options & BundleWiring.FINDENTRIES_RECURSE) == 0 && filePattern.indexOf('*') == -1 && filePattern.indexOf('\\') == -1) {
> 				path += path.charAt(path.length() - 1) == '/' ? filePattern : '/' + filePattern;
> 				for (BundleFile bundleFile : bundleFiles) {
> 					if (bundleFile.getEntry(path) != null && !pathList.contains(path))

Actions: View | Diff

Attachments on bug 337569: 189285