From 38caf3af18958b94d0fd8d869a5a2a6248120eeb Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Mon, 10 Dec 2012 15:59:08 +0400 Subject: [PATCH] [git] @NotNull --- .../git4idea/src/git4idea/history/wholeTree/DetailsCache.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/DetailsCache.java b/plugins/git4idea/src/git4idea/history/wholeTree/DetailsCache.java index 7977082a081a..5db4495f81cd 100644 --- a/plugins/git4idea/src/git4idea/history/wholeTree/DetailsCache.java +++ b/plugins/git4idea/src/git4idea/history/wholeTree/DetailsCache.java @@ -101,9 +101,11 @@ public class DetailsCache { } } + @NotNull public List getBranches(final VirtualFile root, final AbstractHash hash) { synchronized (myLock) { - return myBranches.get(new Pair(root, hash)); + List branches = myBranches.get(new Pair(root, hash)); + return branches == null ? Collections.emptyList() : branches; } }