# [PATCH] Allow monitor/unintersting objects to be null 2 messages from 2009-05-06 to 2009-05-06. Participants: Alex Blewitt, Shawn O. Pearce. Thread: https://gitlist.dev/t/19203 ## Alex Blewitt, 2009-05-06 19:57 Subject: [PATCH] Allow monitor/unintersting objects to be null Message-ID: <1241639836-6719-1-git-send-email-alex.blewitt@gmail.com> URL: https://gitlist.dev/e/1241639836-6719-1-git-send-email-alex.blewitt%40gmail.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 ``` ## Shawn O. Pearce, 2009-05-06 20:02 Subject: Re: [PATCH] Allow monitor/unintersting objects to be null Message-ID: <20090506200235.GI30527@spearce.org> URL: https://gitlist.dev/e/20090506200235.GI30527%40spearce.org In-Reply-To: <1241639836-6719-1-git-send-email-alex.blewitt@gmail.com> ``` Alex Blewitt wrote: > --- > .../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); Can't we use NullProgressMonitor.INSTANCE instead? Also the () around the ?: expression are unnecessary here and our coding style tends not to include them. > @@ -829,6 +829,7 @@ public class PackWriter { > RevObject o = walker.parseAny(id); > walker.markStart(o); > } > + if (uninterestingObjects != null) > for (ObjectId id : uninterestingObjects) { Please fix the indentation of the other code to be properly under the if, or change the variable to be non-final and assign it an empty list if its null, so the for() runs but doesn't crash. Or do that in the only caller, preparePack(Collection,Collection). -- Shawn. ```