From 0b84c5b29ea27cb9af47931792c3819d96da9d8d Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 23 Aug 2018 15:20:57 -0700 Subject: [PATCH] UploadPack: shallowExcludeRefs doesn't need to be nullable Code can check size instead of null, and that makes the initialization trivial. Change-Id: Icbe655816429a7a680926b0e871d96f3b2f1f7ba Signed-off-by: Ivan Frade --- .../org/eclipse/jgit/transport/UploadPack.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java index 09acfdf581..3b66839545 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -309,10 +309,10 @@ public class UploadPack { /** * (Possibly short) ref names, ancestors of which the client has asked us - * not to send using --shallow-exclude. Cannot be non-null if depth is + * not to send using --shallow-exclude. Cannot be non-empty if depth is * nonzero. */ - private @Nullable List shallowExcludeRefs; + private List shallowExcludeRefs = new ArrayList<>(); /** Commit time of the oldest common commit, in seconds. */ private int oldestTime; @@ -1023,16 +1023,12 @@ public class UploadPack { throw new PackProtocolException( JGitText.get().deepenSinceWithDeepen); } - if (shallowExcludeRefs != null) { + if (!shallowExcludeRefs.isEmpty()) { throw new PackProtocolException( JGitText.get().deepenNotWithDeepen); } } else if (line.startsWith("deepen-not ")) { //$NON-NLS-1$ - List exclude = shallowExcludeRefs; - if (exclude == null) { - exclude = shallowExcludeRefs = new ArrayList<>(); - } - exclude.add(line.substring(11)); + shallowExcludeRefs.add(line.substring(11)); if (depth != 0) { throw new PackProtocolException( JGitText.get().deepenNotWithDeepen); @@ -1071,7 +1067,7 @@ public class UploadPack { if (!clientShallowCommits.isEmpty()) { verifyClientShallow(); } - if (depth != 0 || shallowSince != 0 || shallowExcludeRefs != null) { + if (depth != 0 || shallowSince != 0 || !shallowExcludeRefs.isEmpty()) { shallowCommits = new ArrayList<>(); processShallow(shallowCommits, unshallowCommits, false); } @@ -1238,7 +1234,7 @@ public class UploadPack { boolean writeToPckOut) throws IOException { if (options.contains(OPTION_DEEPEN_RELATIVE) || shallowSince != 0 || - shallowExcludeRefs != null) { + !shallowExcludeRefs.isEmpty()) { // TODO(jonathantanmy): Implement deepen-relative, deepen-since, // and deepen-not. throw new UnsupportedOperationException(); -- 2.39.5