Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2003-11-18 19:33:37 +0000
committerMichael Valenta2003-11-18 19:33:37 +0000
commit7e92c49b38c31bb127c787f78dc4fe49532e710a (patch)
tree8500895e0cd6297af7b1d7e31b16af65037ee7f3
parent8c3fe25250b06f74272244c11e8080988eca8640 (diff)
downloadeclipse.platform.team-7e92c49b38c31bb127c787f78dc4fe49532e710a.tar.gz
eclipse.platform.team-7e92c49b38c31bb127c787f78dc4fe49532e710a.tar.xz
eclipse.platform.team-7e92c49b38c31bb127c787f78dc4fe49532e710a.zip
Fix possible NPE on startupI20031119
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java4
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java2
2 files changed, 5 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
index 3f7757863..cccd01e34 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
@@ -767,4 +767,8 @@ public class CVSProviderPlugin extends Plugin {
public boolean crashOnLastRun() {
return crash;
}
+
+ public RemoteContentsCache getRemoteContentsCache() {
+ return RemoteContentsCache.getCache(CVSProviderPlugin.ID);
+ }
}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java
index 8d04eb5dc..a7bff502e 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java
@@ -399,7 +399,7 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile {
}
private RemoteContentsCache getRemoteContentsCache() {
- return RemoteContentsCache.getCache(CVSProviderPlugin.ID);
+ return CVSProviderPlugin.getPlugin().getRemoteContentsCache();
}
/*

Back to the top