MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-54889 (NPE: CvsAnnotationProvider.annotateBinary)

Browse Source
This commit is contained in:
Bas Leijdekkers
2014-03-14 13:48:28 +01:00
parent 2b1f5c1c96
commit db0aa77571
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/annotate/CvsAnnotationProvider.java
+7 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -42,6 +42,7 @@ import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.netbeans.lib.cvsclient.admin.Entry;
import java.io.File;
import java.io.IOException;
@@ -125,7 +126,11 @@ public class CvsAnnotationProvider implements AnnotationProvider{
if (ourDoNotAnnotateBinaryRoots.contains(environment.getCvsRootAsString())) {
return false;
}
return CvsEntriesManager.getInstance().getEntryFor(cvsVirtualFile).isBinary();
final Entry entry = CvsEntriesManager.getInstance().getEntryFor(cvsVirtualFile);
if (entry != null) {
return entry.isBinary();
}
return cvsVirtualFile.getFileType().isBinary();
}
private AnnotateOperation executeOperation(File file, String revision, CvsEnvironment root, boolean binary, boolean retryOnFailure)