From 23dff95d8d64af6cf72f17a1f58f1760b95e5443 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Tue, 6 Sep 2011 14:09:59 +0400
Subject: [PATCH] IDEA-73922 Perforce : hang up on attempt to commit

---
 .../changes/ChangesFragmentedDiffPanel.java   |  1 +
 .../FragmentedDiffRequestFromChange.java      | 19 ++-----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java
index 051943e90f3f..792ca5bb5dd8 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java
@@ -75,6 +75,7 @@ public class ChangesFragmentedDiffPanel implements Disposable {
   private boolean myCurrentHorizontal;
   private JPanel myTopPanel;
 
+  // todo here
   public ChangesFragmentedDiffPanel(final Project project, final FragmentedContent fragmentedContent,
                                     final LinkedList<DiffPanel> cache, String filePath) {
     myProject = project;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/FragmentedDiffRequestFromChange.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/FragmentedDiffRequestFromChange.java
index 6c5783fe3473..569a9f07ceda 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/FragmentedDiffRequestFromChange.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/FragmentedDiffRequestFromChange.java
@@ -202,23 +202,8 @@ public class FragmentedDiffRequestFromChange {
 
     private String notNullContentRevision(final ContentRevision cr) throws VcsException {
       if (cr == null) return "";
-      final Ref<VcsException> ref = new Ref<VcsException>();
-      final String s = new BackgroundSynchronousInvisibleComputable<String>() {
-        @Override
-        protected String runImpl() {
-          try {
-            return cr.getContent();
-          }
-          catch (VcsException e) {
-            ref.set(e);
-            return null;
-          }
-        }
-      }.compute();
-      if (! ref.isNull()) {
-        throw ref.get();
-      }
-      return s == null ? "" : s;
+      String content = cr.getContent();
+      return content == null ? "" : content;
     }
   }