Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2007-04-13 20:16:36 +0000
committerAndrew Niefer2007-04-13 20:16:36 +0000
commit34820c169a748232d5abc6c5b1e101ff9b827bbf (patch)
tree8148122d746f805b57b36141a2dbceedcd6cb984 /bundles/org.eclipse.equinox.launcher
parentb19c64517dc209979ee5a05a803f1863eeaa016f (diff)
downloadrt.equinox.framework-34820c169a748232d5abc6c5b1e101ff9b827bbf.tar.gz
rt.equinox.framework-34820c169a748232d5abc6c5b1e101ff9b827bbf.tar.xz
rt.equinox.framework-34820c169a748232d5abc6c5b1e101ff9b827bbf.zip
bug 147366
Diffstat (limited to 'bundles/org.eclipse.equinox.launcher')
-rw-r--r--bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
index 7827c9b0e..521095d74 100644
--- a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
+++ b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
@@ -390,10 +390,6 @@ public class Main {
setupVMProperties();
processConfiguration();
- //ensure minimum Java version
- if (!checkVersion(System.getProperty("java.version"), System.getProperty(PROP_REQUIRED_JAVA_VERSION))) //$NON-NLS-1$
- return;
-
// need to ensure that getInstallLocation is called at least once to initialize the value.
// Do this AFTER processing the configuration to allow the configuration to set
// the install location.
@@ -405,6 +401,11 @@ public class Main {
//Set up the JNI bridge. We need to know the install location to find the shared library
setupJNI(bootPath);
+ //ensure minimum Java version, do this after JNI is set up so that we can write an error message
+ //with exitdata if we fail.
+ if (!checkVersion(System.getProperty("java.version"), System.getProperty(PROP_REQUIRED_JAVA_VERSION))) //$NON-NLS-1$
+ return;
+
setSecurityPolicy(bootPath);
// splash handling is done here, because the default case needs to know
// the location of the boot plugin we are going to use

Back to the top