Attachment 39607 Details for Bug 106631 – Proposed fix

[patch] Proposed fix

patch_106631.txt (text/plain), 2.19 KB, created by Olivier Thomann

on 2006-04-26 18:03:06 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2006-04-26 18:03:06 EDT

Size: 2.19 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: antadapter/org/eclipse/jdt/core/JDTCompilerAdapter.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/antadapter/org/eclipse/jdt/core/JDTCompilerAdapter.java,v
>retrieving revision 1.61
>diff -u -r1.61 JDTCompilerAdapter.java
>--- antadapter/org/eclipse/jdt/core/JDTCompilerAdapter.java	29 Mar 2006 16:31:17 -0000	1.61
>+++ antadapter/org/eclipse/jdt/core/JDTCompilerAdapter.java	26 Apr 2006 21:44:15 -0000
>@@ -458,17 +458,38 @@
> 
> 		//access rules are expected in the same order as the classpath, but there could
> 		//be elements in the classpath not in the access rules or access rules not in the classpath
>-		for (int i = 0; i < pathElements.length; i++) {
>+		for (int i = 0, max = pathElements.length; i < max; i++) {
> 			if (i > 0)
> 				result.append(File.pathSeparatorChar);
>-			result.append(pathElements[i]);
>+			String pathElement = pathElements[i];
>+			result.append(pathElement);
> 			//the rules list is [path, rule, path, rule, ...]
> 			for (int j = nextRule; j < rulesLength; j += 2) {
>-				if (pathElements[i].endsWith(rules[j])) {
>+				String rule = rules[j];
>+				if (pathElement.endsWith(rule)) {
> 					result.append(rules[j + 1]);
> 					nextRule = j + 2;
> 					break;
> 				}
>+				// if the path doesn't match, it could be due to a trailing file separatorChar in the rule
>+				if (rule.endsWith(File.separator)) {
>+					// rule ends with the File.separator, but pathElement might not
>+					// otherwise it would match on the first endsWith
>+					int ruleLength = rule.length();
>+					if (pathElement.regionMatches(true, pathElement.length() - ruleLength + 1, rule, 0, ruleLength - 1)) {
>+						result.append(rules[j + 1]);
>+						nextRule = j + 2;
>+						break;
>+					}
>+				} else if (pathElement.endsWith(File.separator)) {
>+					// rule doesn't end with the File.separator, but pathElement might
>+					int ruleLength = rule.length();
>+					if (pathElement.regionMatches(true, pathElement.length() - ruleLength - 1, rule, 0, ruleLength)) {
>+						result.append(rules[j + 1]);
>+						nextRule = j + 2;
>+						break;
>+					}
>+				}
> 			}
> 		}
>

Actions: View | Diff

Attachments on bug 106631: 25974 | 39607 | 39611