From 41dddcf334865d0918c4bd93d23a7da642dead47 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 9 Mar 2007 02:18:06 +0000 Subject: [PATCH] dependency graph rebuild was happening too early. retrying a fix. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@2373 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/maven/MavenModule.java | 8 ++------ core/src/main/java/hudson/model/AbstractItem.java | 12 ++++++++++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/hudson/maven/MavenModule.java b/core/src/main/java/hudson/maven/MavenModule.java index be44e9c8a3..a2c5e02d0c 100644 --- a/core/src/main/java/hudson/maven/MavenModule.java +++ b/core/src/main/java/hudson/maven/MavenModule.java @@ -263,12 +263,8 @@ public final class MavenModule extends AbstractProject i Hudson.getInstance().rebuildDependencyGraph(); } - public synchronized void doDoDelete(StaplerRequest req, StaplerResponse rsp) throws IOException { - if(!Hudson.adminCheck(req,rsp)) - return; - - super.doDoDelete(req, rsp); - + protected void performDelete() throws IOException { + super.performDelete(); getParent().onModuleDeleted(this); } diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java index 4b98a16239..d2292cc563 100644 --- a/core/src/main/java/hudson/model/AbstractItem.java +++ b/core/src/main/java/hudson/model/AbstractItem.java @@ -144,11 +144,19 @@ public abstract class AbstractItem extends Actionable implements Item { public synchronized void doDoDelete( StaplerRequest req, StaplerResponse rsp ) throws IOException { if(!Hudson.adminCheck(req,rsp)) return; - Util.deleteRecursive(getRootDir()); + performDelete(); if(this instanceof TopLevelItem) Hudson.getInstance().deleteJob((TopLevelItem)this); + Hudson.getInstance().rebuildDependencyGraph(); - rsp.sendRedirect2(req.getContextPath()+"/"); + rsp.sendRedirect2(req.getContextPath()+"/"+getParent().getUrl()); + } + + /** + * Does the real job of deleting the item. + */ + protected void performDelete() throws IOException { + Util.deleteRecursive(getRootDir()); } }