commit 2bf8ff62050c5d9a7569dad558fcc5076b55a8d5
author Tao Bao <tbao@google.com> Thu Mar 23 21:51:59 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 23 21:51:59 2017 +0000
tree 305a75306dc85d27b1d60453d7f5c61c942538af
parent ef888d1b55c0f1c27e89743dd43dbf3b88aca1c2
parent bc3d2ee5e505c8c61f47903235b86b8c19218286

Merge "Redundant checking of STL container element" am: b56a3c2e3a am: 9e05f26e1a
am: bc3d2ee5e5

Change-Id: I704638b127b43b1e2964f5679bdd486384563a8e

updater/blockimg.cpp

diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index efdfec1..12ca151 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -1220,9 +1220,7 @@
 
     const std::string& id = params.tokens[params.cpos++];
 
-    if (stash_map.find(id) != stash_map.end()) {
-        stash_map.erase(id);
-    }
+    stash_map.erase(id);
 
     if (params.createdstash || params.canwrite) {
         return FreeStash(params.stashbase, id);