Merge pull request #14632 from Microsoft/port14594ToMaster

mhegazy · web-flow · commit 84d5d44ab372 · 2017-03-13T10:48:54.000-07:00
Port #14594 to master
diff --git a/src/server/cancellationToken/cancellationToken.ts b/src/server/cancellationToken/cancellationToken.ts
@@ -48,7 +48,7 @@ function createCancellationToken(args: string[]): ServerCancellationToken {
         return {
             isCancellationRequested: () =>  perRequestPipeName !== undefined && pipeExists(perRequestPipeName),
             setRequest(requestId: number) {
-                currentRequestId = currentRequestId;
+                currentRequestId = requestId;
                 perRequestPipeName = namePrefix + requestId;
             },
             resetRequest(requestId: number) {
@@ -67,4 +67,4 @@ function createCancellationToken(args: string[]): ServerCancellationToken {
         };
     }
 }
-export = createCancellationToken;
+export = createCancellationToken;

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ function createCancellationToken(args: string[]): ServerCancellationToken {`
`48`	`48`	`return {`
`49`	`49`	`isCancellationRequested: () => perRequestPipeName !== undefined && pipeExists(perRequestPipeName),`
`50`	`50`	`setRequest(requestId: number) {`
`51`		`- currentRequestId = currentRequestId;`
	`51`	`+ currentRequestId = requestId;`
`52`	`52`	`perRequestPipeName = namePrefix + requestId;`
`53`	`53`	`},`
`54`	`54`	`resetRequest(requestId: number) {`
`@@ -67,4 +67,4 @@ function createCancellationToken(args: string[]): ServerCancellationToken {`
`67`	`67`	`};`
`68`	`68`	`}`
`69`	`69`	`}`
`70`		`-export = createCancellationToken;`
	`70`	`+export = createCancellationToken;`