fix MPE in HgUtils.differentOutgoingBranchFound
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/18ac8ca0 Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/18ac8ca0 Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/18ac8ca0 Branch: refs/heads/master Commit: 18ac8ca0f4dad979c9312de010d45edd231fb450 Parents: 328c9b0 Author: s13o <Agartsin!1> Authored: Fri Apr 10 01:04:03 2015 +0300 Committer: s13o <Agartsin!1> Committed: Fri Apr 10 01:04:03 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java | 2 +- .../scm/provider/hg/command/inventory/HgOutgoingConsumer.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-scm/blob/18ac8ca0/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java index 36ef6c9..24ba5ee 100644 --- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java +++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java @@ -297,7 +297,7 @@ public final class HgUtils * Method users should not stop the push on a negative return, instead, they should * hg push -r(branch being released) * - * @param logger the logger + * @param logger the logger31 * @param workingDir the working dir * @param workingbranchName the working branch name * @return true if a different outgoing branch was found http://git-wip-us.apache.org/repos/asf/maven-scm/blob/18ac8ca0/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java index 32d24bb..34c39f2 100644 --- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java +++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java @@ -23,6 +23,7 @@ import org.apache.maven.scm.log.ScmLogger; import org.apache.maven.scm.provider.hg.command.HgConsumer; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** @@ -34,7 +35,7 @@ import java.util.List; public class HgOutgoingConsumer extends HgConsumer { - private List<HgChangeSet> changes = new ArrayList<HgChangeSet>(); + private List<HgChangeSet> changes = Collections.synchronizedList(new ArrayList<HgChangeSet>()); private static final String BRANCH = "branch";
