From 232c3ab318b92085d7893c6f6e7f3724dbac03af Mon Sep 17 00:00:00 2001
From: Shanti Subramanyam <shanti.subramanyam@gmail.com>
Date: Tue, 19 Jun 2012 16:24:01 -0700
Subject: [PATCH] Fix for Issue: "After a delete run, tag search throws
 exception"

---
 .../com/sun/faban/harness/webclient/ResultAction.java | 11 ++++++++++-
 .../com/sun/faban/harness/webclient/RunResult.java    |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/harness/src/com/sun/faban/harness/webclient/ResultAction.java b/harness/src/com/sun/faban/harness/webclient/ResultAction.java
index 5cc5c099..6f0b2688 100644
--- a/harness/src/com/sun/faban/harness/webclient/ResultAction.java
+++ b/harness/src/com/sun/faban/harness/webclient/ResultAction.java
@@ -461,12 +461,21 @@ public String archive(HttpServletRequest request,
     }
 
     public String deleteResults(HttpServletRequest request,
-                        HttpServletResponse response) {
+                        HttpServletResponse response) throws IOException {
         String[] runIds = request.getParameterValues("select");
         if (runIds != null) {
+            TagEngine tagEngine;
+            try {
+                tagEngine = TagEngine.getInstance();
+            } catch (ClassNotFoundException ex) {
+                logger.log(Level.SEVERE, "Cannot find tag engine class", ex);
+                throw new IOException("Cannot find tag engine class", ex);
+            }
             for (String r : runIds) {
                 RunResult runResult = RunResult.getInstance(new RunId(r));
                 runResult.delete(r);
+                tagEngine.removeRun(r);
+                tagEngine.save();
             }
         }
         HttpSession session = request.getSession();
diff --git a/harness/src/com/sun/faban/harness/webclient/RunResult.java b/harness/src/com/sun/faban/harness/webclient/RunResult.java
index 170e3cdd..74eddf11 100644
--- a/harness/src/com/sun/faban/harness/webclient/RunResult.java
+++ b/harness/src/com/sun/faban/harness/webclient/RunResult.java
@@ -403,8 +403,8 @@ public static SortableTableModel getResultTable(Subject user, String tags,
                     } catch (Exception e) {
                         logger.log(Level.WARNING, "Cannot remove run " + runid, e);
                     }
-                }
-                resultList.add(res);
+                } else
+                    resultList.add(res);
             } catch (Exception e) {
                 logger.log(Level.WARNING, "Cannot read result dir " + runid, e);
             }