From 4b84186b641ddef39399dfff58bc762090da8fdd Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Wed, 16 Nov 2011 14:52:31 -0800 Subject: [PATCH] Refactor DfsReader selection of cached packs Make the code more clear with a simple refactoring of the boolean logic into a method that describes the condition we are looking for on each pack file. A cached pack is possible if there exists a tips collection, and the collection is non-empty. Change-Id: I4ac42b0622b39d159a0f4f223e291c35c71f672c --- .../src/org/eclipse/jgit/storage/dfs/DfsReader.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsReader.java index 5d3f9a935..0772278b1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsReader.java @@ -554,13 +554,16 @@ final class DfsReader extends ObjectReader implements ObjectReuseAsIs { List cached = new ArrayList(packList.length); for (DfsPackFile pack : packList) { DfsPackDescription desc = pack.getPackDescription(); - if (desc.getTips() == null || desc.getTips().isEmpty()) - continue; - cached.add(new DfsCachedPack(pack)); + if (canBeCachedPack(desc)) + cached.add(new DfsCachedPack(pack)); } return cached; } + private static boolean canBeCachedPack(DfsPackDescription desc) { + return desc.getTips() != null && !desc.getTips().isEmpty(); + } + public void copyPackAsIs(PackOutputStream out, CachedPack pack, boolean validate) throws IOException { try {