From 5795829257f25d1ce6ed5538fa398fc3f4ea4c20 Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Wed, 19 Oct 2016 14:51:35 +0300 Subject: [PATCH] [hg]: return copy of ignored files to be thread safe, optimize size --- .../zmlx/hg4idea/provider/HgLocalIgnoredHolder.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgLocalIgnoredHolder.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgLocalIgnoredHolder.java index f1793a3213a1..c776c7756a38 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgLocalIgnoredHolder.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgLocalIgnoredHolder.java @@ -153,7 +153,7 @@ public class HgLocalIgnoredHolder implements Disposable { public Set getIgnoredFiles() { try { SET_LOCK.readLock().lock(); - return myIgnoredSet; + return ContainerUtil.newHashSet(myIgnoredSet); } finally { SET_LOCK.readLock().unlock(); @@ -173,6 +173,12 @@ public class HgLocalIgnoredHolder implements Disposable { } public int getSize() { - return getIgnoredFiles().size(); + try { + SET_LOCK.readLock().lock(); + return myIgnoredSet.size(); + } + finally { + SET_LOCK.readLock().unlock(); + } } }