From 63bbc4ea27a491a616d4e7f3828223f7799c311e Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Tue, 26 Jan 2016 09:43:10 +0100
Subject: [PATCH] Fix tslint warnings in json extension

---
 extensions/json/server/src/json-toolbox/json.ts |  2 +-
 extensions/json/server/src/utils/httpRequest.ts | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/extensions/json/server/src/json-toolbox/json.ts b/extensions/json/server/src/json-toolbox/json.ts
index c9f2b7c126b..431ffcfec61 100644
--- a/extensions/json/server/src/json-toolbox/json.ts
+++ b/extensions/json/server/src/json-toolbox/json.ts
@@ -196,7 +196,7 @@ export function createScanner(text:string, ignoreTrivia:boolean = false):JSONSca
 	function scanNext():SyntaxKind {
 
 		value = '';
-		scanError = ScanError.None,
+		scanError = ScanError.None;
 
 		tokenOffset = pos;
 
diff --git a/extensions/json/server/src/utils/httpRequest.ts b/extensions/json/server/src/utils/httpRequest.ts
index 5b0ca9bc11e..4f537993e1d 100644
--- a/extensions/json/server/src/utils/httpRequest.ts
+++ b/extensions/json/server/src/utils/httpRequest.ts
@@ -20,7 +20,7 @@ export interface IXHROptions {
 	timeout?: number;
 	data?: any;
 	agent?: any;
-	strictSSL?: boolean;    
+	strictSSL?: boolean;
 	responseType?: string;
 	followRedirects?: number;
 }
@@ -133,8 +133,12 @@ function request(options: IXHROptions): Promise<IRequestResult> {
 		});
 		req.on('error', e);
 
-		options.timeout && req.setTimeout(options.timeout);
-		options.data && req.write(options.data);
+		if (options.timeout) {
+			req.setTimeout(options.timeout);
+		}
+		if (options.data) {
+			req.write(options.data);
+		}
 
 		req.end();
 	});