View | Details | Raw Unified | Return to bug 165976 | Differences between
and this patch

Collapse All | Expand All

(-)batch/org/eclipse/jdt/internal/compiler/batch/Main.java (-6 / +9 lines)
Lines 1220-1227 Link Here
1220
    			new String[] {"{0}", "{1}", currentClasspathName}); //$NON-NLS-1$ //$NON-NLS-2$ 
1220
    			new String[] {"{0}", "{1}", currentClasspathName}); //$NON-NLS-1$ //$NON-NLS-2$ 
1221
    		accessRuleSet = new AccessRuleSet(accessRules, templates);
1221
    		accessRuleSet = new AccessRuleSet(accessRules, templates);
1222
    	} else {
1222
    	} else {
1223
    		// we go on anyway
1223
     		if (currentClasspathName.length() != 0) {
1224
    		this.logger.logIncorrectClasspath(currentClasspathName);
1224
     	   		// we go on anyway
1225
    			this.logger.logIncorrectClasspath(currentClasspathName);
1226
    		}
1225
    		return;
1227
    		return;
1226
    	}
1228
    	}
1227
	}
1229
	}
Lines 1243-1249 Link Here
1243
			destPath);
1245
			destPath);
1244
	if (currentClasspath != null) {
1246
	if (currentClasspath != null) {
1245
		paths.add(currentClasspath);
1247
		paths.add(currentClasspath);
1246
	} else {
1248
	} else if (currentClasspathName.length() != 0) {
1247
		// we go on anyway
1249
		// we go on anyway
1248
		this.logger.logIncorrectClasspath(currentClasspathName);
1250
		this.logger.logIncorrectClasspath(currentClasspathName);
1249
	}
1251
	}
Lines 3023-3029 Link Here
3023
			break;
3025
			break;
3024
		default :
3026
		default :
3025
			// we go on anyway
3027
			// we go on anyway
3026
			this.logger.logIncorrectClasspath(currentPath);
3028
			if (currentPath.length() != 0) {
3029
				this.logger.logIncorrectClasspath(currentPath);
3030
			}
3027
	}
3031
	}
3028
}
3032
}
3029
3033
Lines 3264-3272 Link Here
3264
						.getClasspath(token, customEncoding, null);
3268
						.getClasspath(token, customEncoding, null);
3265
				if (currentClasspath != null) {
3269
				if (currentClasspath != null) {
3266
					classpaths.add(currentClasspath);
3270
					classpaths.add(currentClasspath);
3267
				} else {
3271
				} else if (token.length() != 0) {
3268
					this.logger.logIncorrectClasspath(token);
3272
					this.logger.logIncorrectClasspath(token);
3269
					// should not happen - we go on anyway
3270
				}
3273
				}
3271
			}
3274
			}
3272
		}
3275
		}
(-)antadapter/org/eclipse/jdt/core/JDTCompilerAdapter.java (-7 / +9 lines)
Lines 107-120 Link Here
107
		 */
107
		 */
108
		cmd.createArgument().setValue("-noExit"); //$NON-NLS-1$
108
		cmd.createArgument().setValue("-noExit"); //$NON-NLS-1$
109
109
110
        if (this.bootclasspath != null && this.bootclasspath.size() != 0) {
110
        if (this.bootclasspath != null) {
111
			/*
112
			 * Set the bootclasspath for the Eclipse compiler.
113
			 */
114
			cmd.createArgument().setValue("-bootclasspath"); //$NON-NLS-1$
111
			cmd.createArgument().setValue("-bootclasspath"); //$NON-NLS-1$
115
			cmd.createArgument().setPath(this.bootclasspath);        	
112
        	if (this.bootclasspath.size() != 0) {
116
        } else {
113
    			/*
117
            this.includeJavaRuntime = true;
114
    			 * Set the bootclasspath for the Eclipse compiler.
115
    			 */
116
    			cmd.createArgument().setPath(this.bootclasspath);
117
        	} else {
118
    			cmd.createArgument().setValue(Util.EMPTY_STRING);
119
        	}
118
        }
120
        }
119
121
120
        Path classpath = new Path(this.project);
122
        Path classpath = new Path(this.project);

Return to bug 165976