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

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 5d3f9a93546b94654a5c0ca5aae776525b0db7ea..0772278b1fa8cf5e06ea56f0ecf4b49275f2e31f 100644 (file)
--- 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<CachedPack> cached = new ArrayList<CachedPack>(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 {