This is an automated email from the ASF dual-hosted git repository. ardovm pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit a21130c6463ad3febf6ac47c701141503313ab84 Author: Arrigo Marchiori <ard...@yahoo.it> AuthorDate: Sat Nov 12 08:02:06 2022 +0100 Add separator to an already existing path only (cherry picked from commit a543930b28f88aae91acc3be9d2fcf0e281a4ae0) --- main/jvmfwk/source/fwkbase.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/main/jvmfwk/source/fwkbase.cxx b/main/jvmfwk/source/fwkbase.cxx index 293153ce96..f5cab3fa7a 100644 --- a/main/jvmfwk/source/fwkbase.cxx +++ b/main/jvmfwk/source/fwkbase.cxx @@ -398,7 +398,10 @@ rtl::OString BootParams::getClasspath() char * pCp = getenv("CLASSPATH"); if (pCp) { - sClassPath += rtl::OString(szSep) + rtl::OString(pCp); + if (sClassPath.getLength()) { + sClassPath += rtl::OString(szSep); + } + sClassPath += rtl::OString(pCp); } #if OSL_DEBUG_LEVEL >=2 fprintf(stderr,"[Java framework] Using bootstrap parameter "