Fix AbstractHost.remove

Fixes #2279

Author: MarcMil

src/main/java/soot/tagkit/AbstractHost.java

@@ -23,6 +23,7 @@
  */
 
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 import java.util.function.Supplier;
 
@@ -59,27 +60,17 @@ public List<Tag> getTags() {
    */
   @Override
   public void removeTag(String aName) {
-    int tagIndex = searchForTag(aName);
-    if (tagIndex != -1) {
-      mTagList.remove(tagIndex);
-    }
-  }
-
-  /**
-   * Search for {@link Tag} named {@code aName}.
-   */
-  private int searchForTag(String aName) {
-    if (mTagList != null) {
-      for (int i = 0; i < mTagList.size(); i++) {
-        Tag tag = mTagList.get(i);
-        if (tag != null && tag.getName().equals(aName)) {
-          return i;
-        }
+    Iterator<Tag> it = mTagList.iterator();
+    while (it.hasNext()) {
+      Tag tag = it.next();
+      if (tag != null && tag.getName().equals(aName)) {
+        it.remove();
+        break;
       }
     }
-    return -1;
   }
 
+
   /**
    * Return the {@link Tag} named {@code aName} from {@code this} {@link Host} or {@code null} if there is no such
    * {@link Tag}.
@@ -110,7 +101,14 @@ public Tag getTag(String aName) {
    */
   @Override
   public boolean hasTag(String aName) {
-    return (searchForTag(aName) != -1);
+    if (mTagList != null) {
+      for (Tag tag : mTagList) {
+        if (tag != null && tag.getName().equals(aName)) {
+          return true;
+        }
+      }
+    }
+    return false;
   }
 
   /**