From: Pawel Andruszkiewicz
Date: Wed, 3 Jun 2015 13:29:29 +0000 (+0200)
Subject: [Archive] Fixed return value from open().
X-Git-Tag: submit/tizen_mobile/20150612.133019^2~2^2~50^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a5e05cd153b58ea7aa97c5b5be262aaf48a35562;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git
[Archive] Fixed return value from open().
Prevent CID: 392810
[Verification] TCT pass rate: 100%
Change-Id: I24a870759060e2176d5fccceae2ce7417667bd21
Signed-off-by: Pawel Andruszkiewicz
---
diff --git a/src/archive/archive_instance.cc b/src/archive/archive_instance.cc
index 47804261..a66b74b5 100755
--- a/src/archive/archive_instance.cc
+++ b/src/archive/archive_instance.cc
@@ -218,7 +218,13 @@ void ArchiveInstance::Open(const picojson::value& args, picojson::object& out) {
afp->setOverwrite(overwrite);
callback->setArchiveFile(afp);
- ArchiveManager::getInstance().open(callback);
+ result = ArchiveManager::getInstance().open(callback);
+
+ if (result) {
+ ReportSuccess(out);
+ } else {
+ ReportError(result, &out);
+ }
}
void ArchiveInstance::Abort(const picojson::value& args, picojson::object& out)
diff --git a/src/archive/archive_manager.cc b/src/archive/archive_manager.cc
index e60db683..1eb432e2 100755
--- a/src/archive/archive_manager.cc
+++ b/src/archive/archive_manager.cc
@@ -92,7 +92,7 @@ PlatformResult ArchiveManager::getPrivData(long handle, ArchiveFilePtr* archive_
return PlatformResult(ErrorCode::UNKNOWN_ERR, "Priv is null");
}
-long ArchiveManager::open(OpenCallbackData* callback)
+PlatformResult ArchiveManager::open(OpenCallbackData* callback)
{
LoggerD("Entered");
@@ -104,7 +104,7 @@ long ArchiveManager::open(OpenCallbackData* callback)
// ArchiveFilePtr a_ptr = ArchiveFilePtr(new ArchiveFile(FileMode::READ));
ArchiveFilePtr a_ptr = callback->getArchiveFile();
- a_ptr->addOperation(callback);
+ return a_ptr->addOperation(callback);
}
void ArchiveManager::eraseElementFromArchiveFileMap(long operation_id)
diff --git a/src/archive/archive_manager.h b/src/archive/archive_manager.h
index 874082f8..354edb09 100755
--- a/src/archive/archive_manager.h
+++ b/src/archive/archive_manager.h
@@ -40,7 +40,7 @@ public:
void erasePrivData(long handle);
long addPrivData(ArchiveFilePtr archive_file_ptr);
common::PlatformResult getPrivData(long handle, ArchiveFilePtr* archive_file);
- long open(OpenCallbackData* callback);
+ common::PlatformResult open(OpenCallbackData* callback);
private:
ArchiveManager();