diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-05-08 12:58:01 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-05-08 12:58:01 +0200 |
| commit | 5a8b1b16de62bf595df7927891d539691ac26a89 (patch) | |
| tree | 8ffcd43cdea5446d33af1cc77b192d4678d18aab /jvmfwk | |
| parent | 95343c998a078b30ca83d2e1be40149f7f56fed7 (diff) | |
Remove unused jfw_setJRELocations
Change-Id: If71cc5052f7ddfbc2d69ba01aa0cd3be2a4def8e
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/source/framework.cxx | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index dcaac1b72dd0..56e24c6400a5 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -171,7 +171,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi rtl_freeMemory(arInfos); //Check if the current plugin can detect JREs at the location - // of the paths added by jfw_setJRELocations or jfw_addJRELocation + // of the paths added by jfw_addJRELocation //get the function from the plugin #ifndef DISABLE_DYNLOADING jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc = @@ -591,7 +591,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) if (!pluginLib.is()) return JFW_E_NO_PLUGIN; //Check if the current plugin can detect JREs at the location - // of the paths added by jfw_setJRELocations or jfw_addJRELocation + // of the paths added by jfw_addJRELocation //get the function from the plugin jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc = (jfw_plugin_getJavaInfoByPath_ptr) pluginLib.getFunctionSymbol( @@ -1109,31 +1109,6 @@ javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString * sLocation) } -javaFrameworkError SAL_CALL jfw_setJRELocations( - rtl_uString ** arLocations, sal_Int32 nLen) -{ - javaFrameworkError errcode = JFW_E_NONE; - try - { - osl::MutexGuard guard(jfw::FwkMutex::get()); - if (jfw::getMode() == jfw::JFW_MODE_DIRECT) - return JFW_E_DIRECT_MODE; - jfw::NodeJava node(jfw::NodeJava::USER); - if (arLocations == NULL && nLen != 0) - return JFW_E_INVALID_ARG; - node.setJRELocations(arLocations, nLen); - node.write(); - } - catch (const jfw::FrameworkException& e) - { - errcode = e.errorCode; - fprintf(stderr, "%s\n", e.message.getStr()); - OSL_FAIL(e.message.getStr()); - } - return errcode; - -} - javaFrameworkError SAL_CALL jfw_getJRELocations( rtl_uString *** parLocations, sal_Int32 *pLen) { |