From 154e3c886bafc429fe310d40741be34e5e4c87c9 Mon Sep 17 00:00:00 2001 From: Colby Ranger Date: Thu, 27 Dec 2012 11:21:20 -0800 Subject: [PATCH] Do not enforce DeltaWindow maxMemory when zero. The maxMemory for a DeltaWindow can be optionally disabled when it is less than or equal to zero. Respect this configuration when enforcing the limits on object load. Change-Id: Ic0f4ffcabf82105f8e690bd0eb5e6be485a313b3 --- .../src/org/eclipse/jgit/storage/pack/DeltaWindow.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/DeltaWindow.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/DeltaWindow.java index b440774bc6..2f18788915 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/DeltaWindow.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/DeltaWindow.java @@ -460,6 +460,9 @@ class DeltaWindow { } private void checkLoadable(DeltaWindowEntry ent, long need) { + if (maxMemory <= 0) + return; + int tail = next(resSlot); while (maxMemory < loaded + need) { DeltaWindowEntry cur = window[tail]; -- 2.39.5