[Archive] Fixed return value from open().
authorPawel Andruszkiewicz <p.andruszkie@samsung.com>
Wed, 3 Jun 2015 13:29:29 +0000 (15:29 +0200)
committerPawel Andruszkiewicz <p.andruszkie@samsung.com>
Wed, 3 Jun 2015 13:29:29 +0000 (15:29 +0200)
Prevent CID: 392810

[Verification] TCT pass rate: 100%

Change-Id: I24a870759060e2176d5fccceae2ce7417667bd21
Signed-off-by: Pawel Andruszkiewicz <p.andruszkie@samsung.com>
src/archive/archive_instance.cc
src/archive/archive_manager.cc
src/archive/archive_manager.h

index 478042618be2be8b4ff40deabbbbc29c3b40566a..a66b74b56f093c49ce083dca4f947ba5d4e09e40 100755 (executable)
@@ -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)
index e60db6837250558634ee276e321372a1bf0e7f63..1eb432e23446441b53ed38c2d6018ba842f11fc6 100755 (executable)
@@ -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)
index 874082f8fec9bcea5025ac5263eda086ccb0f6b7..354edb09e5b78f053669ab544c2e585d3f1f83c9 100755 (executable)
@@ -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();