Attachment #218743 for bug #293398

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

View | Details | Raw Unified | Return to bug 293398
Collapse All | Expand All




	}

	protected static File getJavaExecutable() {
		// set the 'java.home' system property on the Mac OS
		if (Platform.getOS().equals(Constants.OS_MACOSX))
			System.setProperty("java.home", "/Library/Java/Home");
		
		// retrieve the 'java.home' system property. If that directory doesn't exist, return null
		File javaHome;
		try {
			javaHome = new File(System.getProperty("java.home")).getCanonicalFile();
		} catch (IOException e) {

Return to bug 293398

Lines 168-179 Link Here

(-)src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java (-3 / +3 lines)
168	}	168	}
169		169
170	protected static File getJavaExecutable() {	170	protected static File getJavaExecutable() {
171	// do not detect on the Mac OS	171	// set the 'java.home' system property on the Mac OS
172	if (Platform.getOS().equals(Constants.OS_MACOSX))	172	if (Platform.getOS().equals(Constants.OS_MACOSX))
173	return null;	173	System.setProperty("java.home", "/Library/Java/Home");
174		174
175	// retrieve the 'java.home' system property. If that directory doesn't exist, return null	175	// retrieve the 'java.home' system property. If that directory doesn't exist, return null
176	File javaHome;	176	File javaHome;
177	try {	177	try {
178	javaHome = new File(System.getProperty("java.home")).getCanonicalFile();	178	javaHome = new File(System.getProperty("java.home")).getCanonicalFile();
179	} catch (IOException e) {	179	} catch (IOException e) {