Attachment 54605 Details for Bug 165976 – Proposed fix

[patch] Proposed fix

patch_165976.txt (text/plain), 2.94 KB, created by Olivier Thomann

on 2006-11-27 23:19:29 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2006-11-27 23:19:29 EST

Size: 2.94 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.65
>diff -u -r1.65 JDTCompilerAdapter.java
>--- antadapter/org/eclipse/jdt/core/JDTCompilerAdapter.java	24 Nov 2006 01:32:07 -0000	1.65
>+++ antadapter/org/eclipse/jdt/core/JDTCompilerAdapter.java	28 Nov 2006 04:15:45 -0000
>@@ -107,14 +107,14 @@
> 		 */
> 		cmd.createArgument().setValue("-noExit"); //$NON-NLS-1$
> 
>+		cmd.createArgument().setValue("-bootclasspath"); //$NON-NLS-1$
>         if (this.bootclasspath != null && this.bootclasspath.size() != 0) {
> 			/*
> 			 * Set the bootclasspath for the Eclipse compiler.
> 			 */
>-			cmd.createArgument().setValue("-bootclasspath"); //$NON-NLS-1$
> 			cmd.createArgument().setPath(this.bootclasspath);        	
>-        } else {
>-            this.includeJavaRuntime = true;
>+        } else if (!this.includeJavaRuntime) {
>+        	cmd.createArgument().setValue(Util.EMPTY_STRING);
>         }
> 
>         Path classpath = new Path(this.project);
>Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v
>retrieving revision 1.271
>diff -u -r1.271 Main.java
>--- batch/org/eclipse/jdt/internal/compiler/batch/Main.java	24 Nov 2006 01:32:03 -0000	1.271
>+++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java	28 Nov 2006 04:15:47 -0000
>@@ -1220,8 +1220,10 @@
>     			new String[] {"{0}", "{1}", currentClasspathName}); //$NON-NLS-1$ //$NON-NLS-2$ 
>     		accessRuleSet = new AccessRuleSet(accessRules, templates);
>     	} else {
>-    		// we go on anyway
>-    		this.logger.logIncorrectClasspath(currentClasspathName);
>+     		if (currentClasspathName.length() != 0) {
>+     	   		// we go on anyway
>+    			this.logger.logIncorrectClasspath(currentClasspathName);
>+    		}
>     		return;
>     	}
> 	}
>@@ -1243,7 +1245,7 @@
> 			destPath);
> 	if (currentClasspath != null) {
> 		paths.add(currentClasspath);
>-	} else {
>+	} else if (currentClasspathName.length() != 0) {
> 		// we go on anyway
> 		this.logger.logIncorrectClasspath(currentClasspathName);
> 	}
>@@ -3023,7 +3025,9 @@
> 			break;
> 		default :
> 			// we go on anyway
>-			this.logger.logIncorrectClasspath(currentPath);
>+			if (currentPath.length() != 0) {
>+				this.logger.logIncorrectClasspath(currentPath);
>+			}
> 	}
> }
> 
>@@ -3264,9 +3268,8 @@
> 						.getClasspath(token, customEncoding, null);
> 				if (currentClasspath != null) {
> 					classpaths.add(currentClasspath);
>-				} else {
>+				} else if (token.length() != 0) {
> 					this.logger.logIncorrectClasspath(token);
>-					// should not happen - we go on anyway
> 				}
> 			}
> 		}

Actions: View | Diff

Attachments on bug 165976: 54605 | 54648