Modified columnNamesToTuple()

Change-Id: Ibf9074b737088606d61f269e3025794c1f3097b6
Signed-off-by: Somin Kim <somin926.kim@samsung.com>
(cherry picked from commit b58b06ca84a0ca014566e195bddfe415ca2b4e14)

diff --git a/src/server/AppHistoryClient.cpp b/src/server/AppHistoryClient.cpp
index c69b841..fc3beb8 100644 (file)
--- a/src/server/AppHistoryClient.cpp
+++ b/src/server/AppHistoryClient.cpp
@@ -22,7 +22,7 @@
 
 using namespace ctx;
 
-static const char* columnNamesToTuple(std::vector<std::string>& columnNames)
+static std::string columnNamesToTuple(std::vector<std::string>& columnNames)
 {
        std::string result;
 
@@ -30,7 +30,10 @@ static const char* columnNamesToTuple(std::vector<std::string>& columnNames)
                result += *it + ",";
        }
 
-       return result.substr(0, result.length() - 1).c_str();
+       if (!result.empty())
+               result.pop_back();
+
+       return result;
 }
 
 AppHistoryClient::AppHistoryClient(ServiceBase* hostService, const std::string& busName) :
@@ -95,7 +98,5 @@ void AppHistoryClient::__readJson(StatsProvider* provider, MethodCall* methodCal
        if (result.empty())
                throw static_cast<int>(E_NO_DATA);
 
-       methodCall->reply(g_variant_new("(sv)", columnNamesToTuple(columnNames), Tuple::toGVariant(result)));
+       methodCall->reply(g_variant_new("(sv)", columnNamesToTuple(columnNames).c_str(), Tuple::toGVariant(result)));
 }
-
-