From d00f527d659c9eb1fabc434b45f94b98e221c509 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Thu, 9 Jun 2011 16:56:53 -0700 Subject: [PATCH] DHT: Fix NPE during prefetch The Prefetcher may have loaded a chunk that is a fragment, if the DhtReader is scanning the Prefetcher's chunks for a particular object fragment chunks will be missing the index and NPE during the findOffset() call into the index itself. Change-Id: Ie2823724c289f745655076c5209acec32361a1ea Signed-off-by: Shawn O. Pearce --- .../src/org/eclipse/jgit/storage/dht/PackChunk.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/PackChunk.java b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/PackChunk.java index c0684022f..66d3d3386 100644 --- a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/PackChunk.java +++ b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/PackChunk.java @@ -291,7 +291,7 @@ public final class PackChunk { } int findOffset(RepositoryKey repo, AnyObjectId objId) { - if (key.getRepositoryId() == repo.asInt()) + if (key.getRepositoryId() == repo.asInt() && index != null) return index.findOffset(objId); return -1; }