Add null checks to fix integration tests

Tyriar · Tyriar · commit 084764d13bdf · 2016-10-17T11:26:39.000-07:00
diff --git a/src/vs/platform/backup/node/backupService.ts b/src/vs/platform/backup/node/backupService.ts
@@ -135,8 +135,12 @@ export class BackupService implements IBackupService {
 		}
 
 		return this.load().then(() => {
-			this.fileContent.folderWorkspaces[this.workspaceResource.fsPath] = this.fileContent.folderWorkspaces[this.workspaceResource.fsPath].filter(value => value !== resource.fsPath);
-			return this.save();
+			const workspace = this.fileContent.folderWorkspaces[this.workspaceResource.fsPath];
+			if (workspace) {
+				this.fileContent.folderWorkspaces[this.workspaceResource.fsPath] = workspace.filter(value => value !== resource.fsPath);
+				return this.save();
+			}
+			return TPromise.as(void 0);
 		});
 	}
 
diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts
@@ -247,7 +247,7 @@ export class WorkbenchShell {
 
 		// Backup
 		const backupService = instantiationService.createInstance(BackupService);
-		backupService.setCurrentWorkspace(this.contextService.getWorkspace().resource);
+		backupService.setCurrentWorkspace(this.contextService.getWorkspace() ? this.contextService.getWorkspace().resource : null);
 		serviceCollection.set(IBackupService, backupService);
 
 		// Storage

Original file line number	Diff line number	Diff line change
`@@ -135,8 +135,12 @@ export class BackupService implements IBackupService {`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`return this.load().then(() => {`
`138`		`- this.fileContent.folderWorkspaces[this.workspaceResource.fsPath] = this.fileContent.folderWorkspaces[this.workspaceResource.fsPath].filter(value => value !== resource.fsPath);`
`139`		`- return this.save();`
	`138`	`+ const workspace = this.fileContent.folderWorkspaces[this.workspaceResource.fsPath];`
	`139`	`+ if (workspace) {`
	`140`	`+ this.fileContent.folderWorkspaces[this.workspaceResource.fsPath] = workspace.filter(value => value !== resource.fsPath);`
	`141`	`+ return this.save();`
	`142`	`+ }`
	`143`	`+ return TPromise.as(void 0);`
`140`	`144`	`});`
`141`	`145`	`}`
`142`	`146`