From adedddc8dbb050342f883b8966b9fe3fad5207f8 Mon Sep 17 00:00:00 2001
From: Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
Date: Tue, 14 Oct 2014 08:47:31 +0200
Subject: [PATCH] Remove "noexcept" keyword from admin's Logic class

We don't want cause application termination.
All exceptions should be caught and handled.

Change-Id: Ic245fb42a8b8fa7a7d83665ce95c4acb89c5b964
---
 src/admin/api/ApiInterface.h | 10 +++++-----
 src/admin/logic/Logic.cpp    |  8 ++++----
 src/admin/logic/Logic.h      | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/admin/api/ApiInterface.h b/src/admin/api/ApiInterface.h
index bbfe98d..62c40e5 100644
--- a/src/admin/api/ApiInterface.h
+++ b/src/admin/api/ApiInterface.h
@@ -42,13 +42,13 @@ public:
     virtual ~ApiInterface() {};
 
     virtual int setPolicies(const std::map<PolicyBucketId, std::vector<Policy>> &insertOrUpdate,
-                    const std::map<PolicyBucketId, std::vector<PolicyKey>> &remove) noexcept = 0;
-    virtual int insertOrUpdateBucket(const PolicyBucketId &bucket, const PolicyResult &policyResult)
-                    noexcept = 0;
-    virtual int removeBucket(const PolicyBucketId &bucket) noexcept = 0;
+                            const std::map<PolicyBucketId, std::vector<PolicyKey>> &remove) = 0;
+    virtual int insertOrUpdateBucket(const PolicyBucketId &bucket,
+                                     const PolicyResult &policyResult) = 0;
+    virtual int removeBucket(const PolicyBucketId &bucket) = 0;
 
     virtual int adminCheck(const PolicyBucketId &startBucket, bool recursive,
-                           const PolicyKey &key, PolicyResult &result) noexcept = 0;
+                           const PolicyKey &key, PolicyResult &result) = 0;
 
 };
 
diff --git a/src/admin/logic/Logic.cpp b/src/admin/logic/Logic.cpp
index 6906056..3b004d9 100644
--- a/src/admin/logic/Logic.cpp
+++ b/src/admin/logic/Logic.cpp
@@ -112,21 +112,21 @@ int Logic::askCynaraAndInterpreteCodeResponse(Args... args) {
 }
 
 int Logic::setPolicies(const std::map<PolicyBucketId, std::vector<Policy>> &insertOrUpdate,
-                const std::map<PolicyBucketId, std::vector<PolicyKey>> &remove) noexcept {
+                       const std::map<PolicyBucketId, std::vector<PolicyKey>> &remove) {
     return askCynaraAndInterpreteCodeResponse<SetPoliciesRequest>(insertOrUpdate, remove);
 }
 
 int Logic::insertOrUpdateBucket(const PolicyBucketId &bucket,
-                                const PolicyResult &policyResult) noexcept {
+                                const PolicyResult &policyResult) {
     return askCynaraAndInterpreteCodeResponse<InsertOrUpdateBucketRequest>(bucket, policyResult);
 }
 
-int Logic::removeBucket(const PolicyBucketId &bucket) noexcept {
+int Logic::removeBucket(const PolicyBucketId &bucket) {
     return askCynaraAndInterpreteCodeResponse<RemoveBucketRequest>(bucket);
 }
 
 int Logic::adminCheck(const PolicyBucketId &startBucket, bool recursive, const PolicyKey &key,
-                      PolicyResult &result) noexcept {
+                      PolicyResult &result) {
     try {
         if (!ensureConnection()) {
             LOGE("Cannot connect to cynara. Service not available.");
diff --git a/src/admin/logic/Logic.h b/src/admin/logic/Logic.h
index 527e992..a8688c2 100644
--- a/src/admin/logic/Logic.h
+++ b/src/admin/logic/Logic.h
@@ -44,13 +44,13 @@ public:
     virtual ~Logic() {};
 
     virtual int setPolicies(const std::map<PolicyBucketId, std::vector<Policy>> &insertOrUpdate,
-                    const std::map<PolicyBucketId, std::vector<PolicyKey>> &remove) noexcept;
-    virtual int insertOrUpdateBucket(const PolicyBucketId &bucket, const PolicyResult &policyResult)
-                    noexcept;
-    virtual int removeBucket(const PolicyBucketId &bucket) noexcept;
+                            const std::map<PolicyBucketId, std::vector<PolicyKey>> &remove);
+    virtual int insertOrUpdateBucket(const PolicyBucketId &bucket,
+                                     const PolicyResult &policyResult);
+    virtual int removeBucket(const PolicyBucketId &bucket);
 
     virtual int adminCheck(const PolicyBucketId &startBucket, bool recursive,
-                           const PolicyKey &key, PolicyResult &result) noexcept;
+                           const PolicyKey &key, PolicyResult &result);
 };
 
 } // namespace Cynara
-- 
2.7.4