From: Alex Blewitt Date: Wed, 06 May 2009 19:57:16 GMT Subject: [PATCH] Allow monitor/unintersting objects to be null Message-ID: <1241639836-6719-1-git-send-email-alex.blewitt@gmail.com> --- .../src/org/spearce/jgit/lib/PackWriter.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/PackWriter.java b/org.spearce.jgit/src/org/spearce/jgit/lib/PackWriter.java index ea63942..3d7004d 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/PackWriter.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/PackWriter.java @@ -230,8 +230,8 @@ public class PackWriter { public PackWriter(final Repository repo, final ProgressMonitor imonitor, final ProgressMonitor wmonitor) { this.db = repo; - initMonitor = imonitor; - writeMonitor = wmonitor; + initMonitor = (imonitor == null ? new NullProgressMonitor() : imonitor); + writeMonitor = (wmonitor == null ? new NullProgressMonitor() : wmonitor); this.deflater = new Deflater(db.getConfig().getCore().getCompression()); outputVersion = repo.getConfig().getCore().getPackIndexVersion(); } @@ -829,6 +829,7 @@ public class PackWriter { RevObject o = walker.parseAny(id); walker.markStart(o); } + if (uninterestingObjects != null) for (ObjectId id : uninterestingObjects) { final RevObject o; try { -- 1.6.2.2