From 269a161b3855fcdfde084bd0d786f212cbdd2af0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 2 Jul 2020 13:36:03 +0200 Subject: 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 --- desktop/unx/source/start.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'desktop/unx') diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c index f95cfe4d1eaa..76f3adcb6e9c 100644 --- a/desktop/unx/source/start.c +++ b/desktop/unx/source/start.c @@ -700,7 +700,9 @@ static void exec_javaldx(Args *args) *chomp = '\0'; } - extend_library_path(newpath); + if (newpath[0] != '\0') { + extend_library_path(newpath); + } if (javaldx) osl_freeProcessHandle(javaldx); -- cgit