Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2007-06-21 14:50:18 +0000
committerMichael Valenta2007-06-21 14:50:18 +0000
commit4aedd338fd873e1b518c77ba2d40525dbdfce64c (patch)
treed7a5a912c10481b056aa695e199d7587a88d5e1f /bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs
parentbb1e996a751b9d19323b6b0697fd648aad64acee (diff)
downloadeclipse.platform.team-4aedd338fd873e1b518c77ba2d40525dbdfce64c.tar.gz
eclipse.platform.team-4aedd338fd873e1b518c77ba2d40525dbdfce64c.tar.xz
eclipse.platform.team-4aedd338fd873e1b518c77ba2d40525dbdfce64c.zip
Bug 190434 NPE when closign a project while CVS History is open for a file in it
Diffstat (limited to 'bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs')
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java
index 0add9a632..d8e3715e5 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java
@@ -284,7 +284,8 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
byte[] syncBytes = getSyncBytes();
if(syncBytes != null && !ResourceSyncInfo.isAddition(syncBytes)) {
ICVSRemoteResource remoteFile = CVSWorkspaceRoot.getRemoteResourceFor(resource);
- return ((ICVSRemoteFile)remoteFile).getLogEntries(monitor);
+ if (remoteFile != null)
+ return ((ICVSRemoteFile)remoteFile).getLogEntries(monitor);
}
return new ILogEntry[0];
}

Back to the top