summaryrefslogtreecommitdiffstats
path: root/jvmfwk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-07-02 13:36:03 +0200
committerStephan Bergmann <sbergman@redhat.com>2020-07-02 16:52:41 +0200
commit269a161b3855fcdfde084bd0d786f212cbdd2af0 (patch)
treed1b1d82c1126f51b6a3bdfd91bcca4ef2dd08cd2 /jvmfwk
parentUpcoming improved loplugin:staticanonymous -> redundantstatic: unotools (diff)
downloadcore-269a161b3855fcdfde084bd0d786f212cbdd2af0.tar.gz
core-269a161b3855fcdfde084bd0d786f212cbdd2af0.zip
tdf#129264: Make javaldx always print a line upon successful execution
...where "do not use a JRE" (implying that the printed line consists of just a terminating newline) is a sufficient condition for a successful execution, too. (Also, it appears that extend_library_path in desktop/unx/source/start.c would have introduced unwanted empty segments into the path environment variable when the line printed by javaldx consisted of just a terminating newline.) Change-Id: Ic2f86de8a829b3dea51c0e4da1ac236298e16366 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97756 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index f7c295ec1728..3e8acd674626 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -59,6 +59,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
if (errcode == JFW_E_NONE && !bEnabled)
{
//Do not do any preparation because that may only slow startup time.
+ fprintf(stdout, "\n");
return 0;
}
else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE)