From 4bc98c031493b418a3ab4a1c852325619e754bb5 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sat, 8 Oct 2011 17:25:42 +0200 Subject: [PATCH] fix npe for mercurial repository hooks --- .../sonia/scm/repository/HgChangesetViewer.java | 17 +++++++++++++++++ .../scm/repository/HgRepositoryHandler.java | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgChangesetViewer.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgChangesetViewer.java index 0ed2337c94..321ae1d4a4 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgChangesetViewer.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgChangesetViewer.java @@ -39,6 +39,7 @@ import sonia.scm.util.Util; //~--- JDK imports ------------------------------------------------------------ +import java.io.File; import java.io.IOException; import java.util.HashMap; @@ -71,6 +72,22 @@ public class HgChangesetViewer extends AbstractHgHandler //~--- constructors --------------------------------------------------------- + /** + * Constructs ... + * + * + * @param handler + * @param changesetPagingResultContext + * @param context + * @param repositoryDirectory + */ + public HgChangesetViewer(HgRepositoryHandler handler, + JAXBContext changesetPagingResultContext, + HgContext context, File repositoryDirectory) + { + super(handler, changesetPagingResultContext, context, repositoryDirectory); + } + /** * Constructs ... * diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java index 480216603e..3d14f27c0f 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java @@ -337,8 +337,8 @@ public class HgRepositoryHandler throw new IllegalStateException("directory not found"); } - return new HgChangesetViewer(this, changesetPagingResultContext, null, - null); + return new HgChangesetViewer(this, changesetPagingResultContext, + hgContextProvider.get(), repositoryDirectory); } //~--- methods --------------------------------------------------------------