diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-03-30 14:49:41 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-03-30 14:49:41 +0200 |
| commit | 92a2b2fbb09e08932d6c02be8d8e0d1c8c557aa4 (patch) | |
| tree | f730298b2dd76ed2de805c293386642a9fc50663 /jvmfwk/plugins/sunmajor/javaenvsetup | |
| parent | 0d730cba6f4e22c2445194c9606d8b1ce0394575 (diff) | |
jvmfwk-modified-javavendors-xml.diff: autodetect java (i#99619)
select the java automatically when the system javavendors.xml is modified
do not force to do it the user manually
Diffstat (limited to 'jvmfwk/plugins/sunmajor/javaenvsetup')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index 8e8bfb94ea32..8567d79f9b0e 100644 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -82,12 +82,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) JavaInfo * pInfo = NULL; errcode = jfw_getSelectedJRE( & pInfo); - if (errcode == JFW_E_INVALID_SETTINGS) - { - fprintf(stderr,"javaldx failed. User must select a JRE from options dialog!"); - return -1; - } - else if (errcode != JFW_E_NONE) + if (errcode != JFW_E_NONE && errcode != JFW_E_INVALID_SETTINGS) { fprintf(stderr,"javaldx failed! \n"); return -1; |