diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-04-13 12:08:05 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-04-13 17:32:42 +0200 |
commit | 41a20d3b3750fa6eeb8061af9dd25723d4698feb (patch) | |
tree | 42b0eb8f37e94975a39a6b6fe9412253f384939d /jvmfwk/source/framework.cxx | |
parent | 316536b2e8da23d9f91d75f79cf64b0bf21f84aa (diff) |
More std::unique_ptr<JavaInfo> lifecycle management
Change-Id: If53347633ec4b2f8c2b221ba2057e0c38fa97b67
Diffstat (limited to 'jvmfwk/source/framework.cxx')
-rw-r--r-- | jvmfwk/source/framework.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 42d99557fc0b..b4e94e0d93bf 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -213,7 +213,7 @@ javaFrameworkError jfw_startVM( const jfw::MergedSettings settings; if (!settings.getEnabled()) return JFW_E_JAVA_DISABLED; - aInfo.reset(settings.createJavaInfo()); + aInfo = settings.createJavaInfo(); //check if a Java has ever been selected if (!aInfo) return JFW_E_NO_SELECT; @@ -650,7 +650,7 @@ javaFrameworkError jfw_getSelectedJRE(std::unique_ptr<JavaInfo> *ppInfo) } const jfw::MergedSettings settings; - ppInfo->reset(settings.createJavaInfo()); + *ppInfo = settings.createJavaInfo(); if (!*ppInfo) { return JFW_E_NONE; |