From 4fc50df97df55b1090d8ef5717805003527742cd Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Sun, 10 Oct 2010 13:36:39 -0700 Subject: [PATCH] Fix empty block corner case in PatienceDiff There is a corner case where we get an EMPTY region during recursion, but we didn't expect to receive that. Its harmless to ignore the region since the region is empty and has no content, so do so rather than throwing an exception Change-Id: I50dcec81ecba763072bb739adfab5879fb48b23a Signed-off-by: Shawn O. Pearce --- org.eclipse.jgit/src/org/eclipse/jgit/diff/PatienceDiff.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/PatienceDiff.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/PatienceDiff.java index 571a498ae..dfbf1a49b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/PatienceDiff.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/PatienceDiff.java @@ -182,6 +182,8 @@ private void diff(Edit r, long[] pCommon, int pIdx, int pEnd) { break; case EMPTY: + break; + default: throw new IllegalStateException(); }