12217: Internal error when synchronizing with cvs repository

2 files changed, 4 insertions, 0 deletions

diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
index 3860978ab..2e55e5a87 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
@@ -114,6 +114,7 @@ RemoteFile.errorRetrievingFromCache=Error occured retrieving cached contents: {0
 RemoteFolderTreeBuilder.buildingBase=Collecting local synchronization information
 RemoteFolderTreeBuilder.receivingDelta=Receiving delta for {0}
 RemoteFolderTreeBuilder.receivingRevision=Receiving revision for {0}
+RemoteFolderTreeBuilder.missingParent=An error has occurred processing file ''{0} {1}''
 
 Session.badInt="Malformed file transmission received"
 Session.receiving=Receiving file: {0}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java
index 48cfc8749..b1ffd604b 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java
@@ -606,6 +606,9 @@ public class RemoteFolderTreeBuilder {
 	
 	private void updateRevision(IPath path, String revision) throws CVSException {
 		RemoteFolderTree folder = (RemoteFolderTree)remoteFolderTable.get(path.removeLastSegments(1).toString());
+		if (folder == null) {
+			throw new CVSException(Policy.bind("RemoteFolderTreeBuilder.missingParent", path.toString(), revision));//$NON-NLS-1$
+		}
 		((RemoteFile)folder.getFile(path.lastSegment())).setRevision(revision);
 	}