Remove the check empty token and add catch the exception

Change-Id: I2b1e66c4ad138d8d210c70e9e5801c34360e059d
Signed-off-by: seolheui kim <s414.kim@samsung.com>

diff --git a/server/upgrade-support.cpp b/server/upgrade-support.cpp
index 91c1263..2195603 100644 (file)
--- a/server/upgrade-support.cpp
+++ b/server/upgrade-support.cpp
@@ -238,16 +238,14 @@ void removeMasterKey(const std::string &device)
        runtime::File file(getTokenFileName(device));
        readToken(file, token);
 
-       // already removed
-       if (token.empty()) {
-               INFO(SINK, "Token for " + device + " does not exist. Ignoring.");
-               return;
-       }
-
        auto& up = KeyStoragePlugin::Instance();
        up.remove(token);
 
-       file.remove();
+       try {
+               file.remove();
+       } catch (runtime::Exception &e) {
+               ERROR(SINK, "Failed to remove token: " + std::string(e.what()));
+       }
 }
 
 } // namespace UpgradeSupport