From 74315cbccf13b578551390762d5efc0a30c2d65b Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 13 Apr 2017 15:25:28 +0200
Subject: Use std::unique_ptr<JavaInfo> in jfw_plugin_getJavaInfoFromJavaHome

Change-Id: I8be48d1eec799f347a5edaa67837cf1bbf4d2cc3
---
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'jvmfwk/plugins')

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index da7f6218d0d3..f336532f3515 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -386,7 +386,8 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
 
 javaPluginError jfw_plugin_getJavaInfoFromJavaHome(
     std::vector<pair<OUString, jfw::VersionInfo>> const& vecVendorInfos,
-    JavaInfo ** ppInfo, std::vector<rtl::Reference<VendorBase>> & infos)
+    std::unique_ptr<JavaInfo> * ppInfo,
+    std::vector<rtl::Reference<VendorBase>> & infos)
 {
     assert(ppInfo);
 
@@ -414,7 +415,7 @@ javaPluginError jfw_plugin_getJavaInfoFromJavaHome(
 
             if (errorcode == javaPluginError::NONE)
             {
-                *ppInfo = createJavaInfo(infoJavaHome[0]);
+                ppInfo->reset(createJavaInfo(infoJavaHome[0]));
                 return javaPluginError::NONE;
             }
         }
-- 
cgit