diff options
| author | Bogdan Gheorghe | 2006-05-03 17:53:33 +0000 |
|---|---|---|
| committer | Bogdan Gheorghe | 2006-05-03 17:53:33 +0000 |
| commit | 3de6ebfa7c0699509868fb5baea2556a23bbf7d9 (patch) | |
| tree | 52fa067215a2c0a35b012f4c038c0fd30b744a9b /bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources | |
| parent | a9f29c94ecf86198897d3b21a4bdfa325bbd6e33 (diff) | |
| download | eclipse.platform.team-3de6ebfa7c0699509868fb5baea2556a23bbf7d9.tar.gz eclipse.platform.team-3de6ebfa7c0699509868fb5baea2556a23bbf7d9.tar.xz eclipse.platform.team-3de6ebfa7c0699509868fb5baea2556a23bbf7d9.zip | |
Bug 140007 (RC3) [Sync View] Update with a remote deleted file causes NPE
Diffstat (limited to 'bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java index 7f122c6a5..5c0d78265 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java @@ -154,6 +154,10 @@ public class UpdateContentCachingService { try { RemoteFolderTreeBuilder builder = new RemoteFolderTreeBuilder(repository, file.getParent(), tag); RemoteFile remote = builder.buildTree(file, Policy.subMonitorFor(monitor, 10)); + + if (remote == null) + return null; + byte[] syncBytes = remote.getSyncBytes(); if (builder.getFileDiffs().length > 0) { // Getting the storage of the file will cache the contents |