[Libreoffice-commits] core.git: jvmfwk/plugins

[Stephan Bergmann]

 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 732b8be76f5fff8a039667eb116f1d158696c0b3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jul 1 12:25:36 2014 +0200

    Fix osl_setEnvironment args
    
    Change-Id: I243ecb42d7ba2ce58f4c1a0bf97ad74de947d8bd

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index cffb0b3..217c6ce 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -638,8 +638,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
     OUString javaHome("JAVA_HOME");
     OUString sPathLocation;
     osl_getSystemPathFromFileURL(pInfo->sLocation, & sPathLocation.pData);
-    javaHome += sPathLocation;
-    osl_setEnvironment(javaHome.pData, javaHome.pData);
+    osl_setEnvironment(javaHome.pData, sPathLocation.pData);
 #endif
 
     typedef jint JNICALL JNI_CreateVM_Type(JavaVM **, JNIEnv **, void *);