Merge branch 'tizen_5.0' into tizen

Change-Id: If22b0877f7802232c7c783cf9107f7be4cf31b43

diff --git a/packaging/webapi-plugins.spec b/packaging/webapi-plugins.spec
index f9c75c6..1250ea2 100644 (file)
--- a/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@ -8,7 +8,7 @@
 %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions}
 
 Name:       webapi-plugins
-Version:    2.37
+Version:    2.38
 Release:    0
 License:    Apache-2.0 and BSD-3-Clause and MIT
 Group:      Development/Libraries

diff --git a/src/messaging/messaging_util.cc b/src/messaging/messaging_util.cc
index 5884f0d..d7e6f32 100644 (file)
--- a/src/messaging/messaging_util.cc
+++ b/src/messaging/messaging_util.cc
@@ -36,6 +36,7 @@
 #include "common/logger.h"
 #include "common/platform_exception.h"
 #include "common/scope_exit.h"
+#include "common/tools.h"
 #include "tizen/tizen.h"
 
 using common::ErrorCode;
@@ -271,6 +272,7 @@ PlatformResult MessagingUtil::loadFileContentToString(const std::string& file_pa
                                                       std::string* result) {
   ScopeLogger();
   std::ifstream input_file;
+
   input_file.open(file_path, std::ios::in);
 
   if (input_file.is_open()) {
@@ -284,6 +286,7 @@ PlatformResult MessagingUtil::loadFileContentToString(const std::string& file_pa
     input_file.close();
     *result = ConvertToUtf8(file_path, outString);
   } else {
+    LoggerW("open() error: %s", common::tools::GetErrorString(errno).c_str());
     std::stringstream ss_error_msg;
     ss_error_msg << "Failed to open file: " << file_path;
     return LogAndCreateResult(ErrorCode::IO_ERR, ss_error_msg.str().c_str());