Fix for P130628-1037

Change-Id: Ib5473b8576f3ab100bdb2ba76e86ea63a296e134
Signed-off-by: hs321.lee <hs321.lee@samsung.com>

diff --git a/src/FCnt_ContentManagerImpl.cpp b/src/FCnt_ContentManagerImpl.cpp
index f126fbe..948c622 100644 (file)
--- a/src/FCnt_ContentManagerImpl.cpp
+++ b/src/FCnt_ContentManagerImpl.cpp
@@ -1102,6 +1102,8 @@ _ContentManagerImpl::SaveDataToDatabase(const media_info_h pMediaInfo,
        result r = GetLastResult();
        if (IsFailed(r))
        {
+               ClearLastResult();
+
                SysLog(NID_CNT, "[%s] Failed to perform GetFileExtension operation.", GetErrorMessage(r));
 
                unique_ptr<char[]> pTempPath(_StringConverter::CopyToCharArrayN(pContentData->contentPath));
@@ -1116,6 +1118,7 @@ _ContentManagerImpl::SaveDataToDatabase(const media_info_h pMediaInfo,
                r = mimeType.Append(tempType);
                SysTryReturn(NID_CNT, !IsFailed(r), UuId::GetInvalidUuId(), E_OUT_OF_MEMORY,
                                "[E_OUT_OF_MEMORY] Failed to perform Append operation.");
+
        }
 
        // If the content format is JPG and it has GPS data, it will be saved in database automatically.

diff --git a/src/FCnt_ContentManagerUtilImpl.cpp b/src/FCnt_ContentManagerUtilImpl.cpp
index d73ed3d..25754d4 100755 (executable)
--- a/src/FCnt_ContentManagerUtilImpl.cpp
+++ b/src/FCnt_ContentManagerUtilImpl.cpp
@@ -1629,6 +1629,8 @@ _ContentManagerUtilImpl::CheckContentType(const String& contentPath, bool intern
        }
        else
        {
+               ClearLastResult();
+
                SysLog(NID_CNT, "[%s] Failed to perform GetFileExtension operation.", GetErrorMessage(r));
 
                unique_ptr<char[]> pTempPath(_StringConverter::CopyToCharArrayN(contentPath));