diff --git a/core/src/main/java/hudson/scm/SubversionSCM.java b/core/src/main/java/hudson/scm/SubversionSCM.java index 96d08baba8..8cf26fdc4a 100644 --- a/core/src/main/java/hudson/scm/SubversionSCM.java +++ b/core/src/main/java/hudson/scm/SubversionSCM.java @@ -4,11 +4,13 @@ import hudson.FilePath; import hudson.FilePath.FileCallable; import hudson.Launcher; import hudson.Util; +import hudson.triggers.SCMTrigger; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.BuildListener; import hudson.model.Hudson; import hudson.model.TaskListener; +import hudson.model.SCMedItem; import hudson.remoting.Callable; import hudson.remoting.Channel; import hudson.remoting.VirtualChannel; @@ -306,6 +308,10 @@ public class SubversionSCM extends SCM implements Serializable { } catch (SVNException e) { e.printStackTrace(listener.error("Failed to update "+l.remote)); + // trouble-shooting probe for #591 + if(e.getErrorMessage().getErrorCode()==SVNErrorCode.WC_NOT_LOCKED) { + listener.getLogger().println("Polled jobs are "+SCMTrigger.DESCRIPTOR.getItemsBeingPolled()); + } return null; } } diff --git a/core/src/main/java/hudson/triggers/SCMTrigger.java b/core/src/main/java/hudson/triggers/SCMTrigger.java index f7a6dbe2b8..11ab82ed80 100644 --- a/core/src/main/java/hudson/triggers/SCMTrigger.java +++ b/core/src/main/java/hudson/triggers/SCMTrigger.java @@ -21,6 +21,8 @@ import java.util.Date; import java.util.Set; import java.util.Collections; import java.util.HashSet; +import java.util.List; +import java.util.Arrays; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; @@ -164,8 +166,8 @@ public class SCMTrigger extends Trigger { * Gets the snapshot of {@link SCMedItem}s that are being polled at this very moment. * Designed for trouble-shooting probe. */ - public SCMedItem[] getItemsBeingPolled() { - return items.toArray(new SCMedItem[0]); + public List getItemsBeingPolled() { + return Arrays.asList(items.toArray(new SCMedItem[0])); } public String getDisplayName() {