From 3693ab423f5849f63b59ada290c4a8a919b50e4f Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Mon, 4 Nov 2013 14:36:46 +0400 Subject: [PATCH] [log] quick fix for the deadlock in IDEA-115483 May lead to the situation when the log stays short, if user scrolls to its end before the entire skeleton is loaded. A proper fix will be made later. --- .../com/intellij/vcs/log/data/VcsLogDataHolder.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogDataHolder.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogDataHolder.java index e80e7c8d3fbc..0b04a0a974df 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogDataHolder.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogDataHolder.java @@ -292,12 +292,12 @@ public class VcsLogDataHolder implements Disposable { return; } - try { - myEntireLogLoadWaiter.await(); - } - catch (InterruptedException e) { - throw new RuntimeException(e); - } +// try { +// myEntireLogLoadWaiter.await(); +// } +// catch (InterruptedException e) { +// throw new RuntimeException(e); +// } List compoundLog = myMultiRepoJoiner.join(myLogData.myLogsByRoot.values()); DataPack fullDataPack = DataPack.build(compoundLog, myLogData.getAllRefs(), indicator);