IDEA-73922 Perforce : hang up on attempt to commit

This commit is contained in:
irengrig
2011-09-06 14:50:01 +04:00
parent 84b59c3627
commit 23dff95d8d
2 changed files with 3 additions and 17 deletions
@@ -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;
@@ -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;
}
}