Merge pull request akara#36 from shanti/delfix

Fix for Issue: "After a delete run, tag search throws exception"
shanti · Jun 21, 2012 · 6c60813 · 6c60813
2 parents 0492df8 + 232c3ab
commit 6c60813
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git 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
@@ -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);
             }