microsoft#106358

Rachel Macfarlane · Rachel Macfarlane · commit cceaf143236f · 2020-09-09T15:37:31.000-07:00
diff --git a/src/vs/base/node/ps.ts b/src/vs/base/node/ps.ts
@@ -193,6 +193,11 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {
 							processInfo.load = parseFloat(cpuUsage[i]);
 						}
 
+						if (!rootItem) {
+							reject(new Error(`Root process ${rootPid} not found`));
+							return;
+						}
+
 						resolve(rootItem);
 					}
 				});
@@ -228,7 +233,11 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {
 							if (process.platform === 'linux') {
 								calculateLinuxCpuUsage();
 							} else {
-								resolve(rootItem);
+								if (!rootItem) {
+									reject(new Error(`Root process ${rootPid} not found`));
+								} else {
+									resolve(rootItem);
+								}
 							}
 						}
 					});
diff --git a/src/vs/workbench/services/authentication/browser/authenticationService.ts b/src/vs/workbench/services/authentication/browser/authenticationService.ts
@@ -444,7 +444,12 @@ export class AuthenticationService extends Disposable implements IAuthentication
 		const didRegister: Promise<MainThreadAuthenticationProvider> = new Promise((resolve, _) => {
 			this.onDidRegisterAuthenticationProvider(e => {
 				if (e.id === providerId) {
-					resolve(this._authenticationProviders.get(providerId));
+					provider = this._authenticationProviders.get(providerId);
+					if (provider) {
+						resolve(provider);
+					} else {
+						throw new Error(`No authentication provider '${providerId}' is currently registered.`);
+					}
 				}
 			});
 		});

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,11 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {`
`193`	`193`	`processInfo.load = parseFloat(cpuUsage[i]);`
`194`	`194`	`}`
`195`	`195`
	`196`	`+ if (!rootItem) {`
	`197`	+ reject(new Error(`Root process ${rootPid} not found`));
	`198`	`+ return;`
	`199`	`+ }`
	`200`	`+`
`196`	`201`	`resolve(rootItem);`
`197`	`202`	`}`
`198`	`203`	`});`
`@@ -228,7 +233,11 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {`
`228`	`233`	`if (process.platform === 'linux') {`
`229`	`234`	`calculateLinuxCpuUsage();`
`230`	`235`	`} else {`
`231`		`- resolve(rootItem);`
	`236`	`+ if (!rootItem) {`
	`237`	+ reject(new Error(`Root process ${rootPid} not found`));
	`238`	`+ } else {`
	`239`	`+ resolve(rootItem);`
	`240`	`+ }`
`232`	`241`	`}`
`233`	`242`	`}`
`234`	`243`	`});`