Attachment 65733 Details for Bug 185288 – Patch against R3_2_maintenance branch.

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

Patch against R3_2_maintenance branch.

jwspatch.txt (text/plain), 1.33 KB, created by Sandi Schoellhammer

on 2007-05-03 03:32:48 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sandi Schoellhammer

Created: 2007-05-03 03:32:48 EDT

Size: 1.33 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.platform
>Index: src/org/eclipse/core/launcher/WebStartMain.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.platform/src/org/eclipse/core/launcher/Attic/WebStartMain.java,v
>retrieving revision 1.8.2.3
>diff -u -r1.8.2.3 WebStartMain.java
>--- src/org/eclipse/core/launcher/WebStartMain.java	11 Jan 2007 22:20:11 -0000	1.8.2.3
>+++ src/org/eclipse/core/launcher/WebStartMain.java	1 May 2007 14:18:06 -0000
>@@ -12,7 +12,6 @@
> 
> import java.io.IOException;
> import java.net.JarURLConnection;
>-import java.net.MalformedURLException;
> import java.net.URL;
> import java.net.URLConnection;
> import java.util.*;
>@@ -51,7 +50,7 @@
> 
> 	protected void basicRun(String[] args) throws Exception {
> 		preciseIdExtraction = Boolean.getBoolean(PROP_WEBSTART_PRECISE_BUNDLEID);
>-		if (checkVersion(System.getProperty("java.version"), JAVA_6))
>+		if (checkVersion(getJWSVersion(), JAVA_6))
> 			preciseIdExtraction = true;
> 		setDefaultBundles();
> 		addOSGiBundle();
>@@ -384,4 +383,10 @@
> 		}
> 		return true;
> 	}
>+	
>+	private String getJWSVersion() {
>+		String jwsVersion = System.getProperty("javawebstart.version");
>+		//Removing "javaws-" prefix before returning.
>+		return jwsVersion.substring(jwsVersion.indexOf('-')+1);
>+	}
> }

Actions: View

Attachments on bug 185288: 65733