From a9684270e99037e00670d2d2bb577e31a835bbe0 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 7 Jun 2007 05:53:09 +0000 Subject: [PATCH] making more progress. bug fixes and added "clear error" support. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@3404 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/scm/AbstractScmTagAction.java | 13 +++++++++++ core/src/main/java/hudson/scm/CVSSCM.java | 12 ---------- .../java/hudson/scm/SubversionTagAction.java | 22 ++++++++++--------- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/core/src/main/java/hudson/scm/AbstractScmTagAction.java b/core/src/main/java/hudson/scm/AbstractScmTagAction.java index 2b771229a0..92e2c71e22 100644 --- a/core/src/main/java/hudson/scm/AbstractScmTagAction.java +++ b/core/src/main/java/hudson/scm/AbstractScmTagAction.java @@ -5,6 +5,7 @@ import hudson.model.TaskListener; import hudson.model.AbstractModelObject; import hudson.model.Action; import hudson.model.AbstractBuild; +import hudson.model.Hudson; import hudson.util.ByteBuffer; import hudson.util.StreamTaskListener; @@ -84,6 +85,18 @@ public abstract class AbstractScmTagAction extends AbstractModelObject implement } } + /** + * Clears the error status. + */ + public synchronized void doClearError(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException { + if(!Hudson.adminCheck(req,rsp)) + return; + + if(workerThread!=null && !workerThread.isAlive()) + workerThread = null; + rsp.sendRedirect("."); + } + public static abstract class AbstractTagWorkerThread extends Thread { // StringWriter is synchronized diff --git a/core/src/main/java/hudson/scm/CVSSCM.java b/core/src/main/java/hudson/scm/CVSSCM.java index 4e2f0f1e52..1aee7253e0 100644 --- a/core/src/main/java/hudson/scm/CVSSCM.java +++ b/core/src/main/java/hudson/scm/CVSSCM.java @@ -1104,18 +1104,6 @@ public class CVSSCM extends AbstractCVSFamilySCM implements Serializable { return name==null || name.length()==0; } - /** - * Clears the error status. - */ - public synchronized void doClearError(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException { - if(!Hudson.adminCheck(req,rsp)) - return; - - if(workerThread!=null && !workerThread.isAlive()) - workerThread = null; - doIndex(req,rsp); - } - /** * Performs tagging. */ diff --git a/core/src/main/java/hudson/scm/SubversionTagAction.java b/core/src/main/java/hudson/scm/SubversionTagAction.java index 284e695811..c58cc37716 100644 --- a/core/src/main/java/hudson/scm/SubversionTagAction.java +++ b/core/src/main/java/hudson/scm/SubversionTagAction.java @@ -4,6 +4,7 @@ import hudson.model.AbstractBuild; import hudson.model.Action; import hudson.model.Hudson; import hudson.model.TaskListener; +import hudson.model.LargeText; import hudson.scm.SubversionSCM.SvnInfo; import hudson.util.CopyOnWriteMap; import org.kohsuke.stapler.StaplerRequest; @@ -24,6 +25,7 @@ import java.util.Map; import java.util.regex.Pattern; import java.util.regex.Matcher; import java.util.Map.Entry; +import java.lang.ref.WeakReference; /** * {@link Action} that lets people create tag for the given build. @@ -103,7 +105,7 @@ public class SubversionTagAction extends AbstractScmTagAction { Map newTags = new HashMap(); - int i=0; + int i=-1; for (Entry e : tags.entrySet()) { i++; if(req.getParameter("tag"+i)==null) @@ -111,7 +113,7 @@ public class SubversionTagAction extends AbstractScmTagAction { newTags.put(e.getKey(),req.getParameter("name" + i)); } - new TagWorkerThread(build,newTags).start(); + new TagWorkerThread(newTags).start(); rsp.sendRedirect("."); } @@ -119,19 +121,19 @@ public class SubversionTagAction extends AbstractScmTagAction { /** * The thread that performs tagging operation asynchronously. */ - public static final class TagWorkerThread extends AbstractTagWorkerThread { - /** - * Build that has triggered the tagging operation. - */ - private final AbstractBuild build; + public final class TagWorkerThread extends AbstractTagWorkerThread { private final Map tagSet; - - public TagWorkerThread(AbstractBuild build, Map tagSet) { - this.build = build; + public TagWorkerThread(Map tagSet) { this.tagSet = tagSet; } + public synchronized void start() { + SubversionTagAction.this.workerThread = this; + SubversionTagAction.this.log = new WeakReference(text); + super.start(); + } + @Override protected void perform(TaskListener listener) { SVNClientManager cm = SubversionSCM.createSvnClientManager(SubversionSCM.DescriptorImpl.DESCRIPTOR.createAuthenticationProvider());