[Libreoffice-commits] .: jvmfwk/plugins

[Petr Mladek]

 jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit b2db4550ddc21b16d8b64a558d9dd0f578aed70c
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 14:49:41 2011 +0200

    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

diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index c95a82f..9feee72 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;