From 6766fc85d06464402168e71e27a506eb2042b279 Mon Sep 17 00:00:00 2001 From: Hector Caballero Date: Tue, 6 Feb 2018 06:20:19 -0500 Subject: [PATCH] GC: Merge if statement with the enclosing one Reported by Sonar. Signed-off-by: Hector Oswaldo Caballero Change-Id: Ib6fe6c67d6f7697e6d60693d5cee7e9c6a227767 --- .../org/eclipse/jgit/internal/storage/file/GC.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java index d1c424c4a..5669d49ae 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java @@ -751,17 +751,17 @@ public class GC { RevObject ro = w.next(); while (ro != null) { checkCancelled(); - if (id2File.remove(ro.getId()) != null) - if (id2File.isEmpty()) - return; + if (id2File.remove(ro.getId()) != null && id2File.isEmpty()) { + return; + } ro = w.next(); } ro = w.nextObject(); while (ro != null) { checkCancelled(); - if (id2File.remove(ro.getId()) != null) - if (id2File.isEmpty()) - return; + if (id2File.remove(ro.getId()) != null && id2File.isEmpty()) { + return; + } ro = w.nextObject(); } }