Attachment 260069 Details for Bug 488906 – Updated patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Updated patch

startup-problems.patch (text/plain), 2.66 KB, created by Olivier Thomann

on 2016-03-03 14:38:24 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2016-03-03 14:38:24 EST

Size: 2.66 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/javascriptPlugin.js b/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/javascriptPlugin.js
>index b9dbd23..09dbd0a 100644
>--- a/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/javascriptPlugin.js
>+++ b/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/javascriptPlugin.js
>@@ -132,6 +132,10 @@
> 				pendingStart.f = f;
> 				return; //don't queue start_server requests
> 			}
>+			if(startCount > 0 && msg.args.initial) {
>+				return;
>+			}
>+			startCount++;
> 			ternReady = false;
> 		}
> 		if(ternReady || starting || msg.request === 'read') { //configuration reads can happen while the server is starting
>@@ -165,7 +169,8 @@
>     	 * TODO will need to listen to updated tern plugin settings once enabled to clear this cache
>     	 */
>     	var contributedEnvs,
>-			ternWorker;
>+			ternWorker,
>+			startCount = 0;
> 		
> 		var handlers ={
> 			'read': doRead,
>@@ -178,7 +183,7 @@
> 				}
> 				workerReady = true;
> 				if (!pendingStart.msg || !pendingStart.msg.request){
>-					pendingStart.msg = {request: "start_server", args: {}}; //$NON-NLS-1$
>+					pendingStart.msg = {request: "start_server", args: {initial: true}}; //$NON-NLS-1$
> 				}
> 				ternWorker.postMessage(pendingStart.msg, pendingStart.f);
> 			},
>@@ -283,25 +288,28 @@
> 		 * @since 10.0
> 		 */
> 		function serverReady() {
>-			ternReady = true;
>-			// process all add/remove first
>-			for(var i = 0, len = modifyQueue.length; i < len; i++) {
>-				var item = modifyQueue[i];
>-				if(TRACE) {
>-					console.log("clearing MODIFY queue: "+JSON.stringify(item.msg));
>+			startCount--;
>+			if(startCount === 0) {
>+				ternReady = true;
>+				// process all add/remove first
>+				for(var i = 0, len = modifyQueue.length; i < len; i++) {
>+					var item = modifyQueue[i];
>+					if(TRACE) {
>+						console.log("clearing MODIFY queue: "+JSON.stringify(item.msg));
>+					}
>+					ternWorker.postMessage(item.msg, item.f);
> 				}
>-				ternWorker.postMessage(item.msg, item.f);
>-			}
>-			modifyQueue = [];
>-			// process remaining pending requests
>-			for(i = 0, len = messageQueue.length; i < len; i++) {
>-				item = messageQueue[i];
>-				if(TRACE) {
>-					console.log("clearing MESSAGE queue: "+JSON.stringify(item.msg));
>+				modifyQueue = [];
>+				// process remaining pending requests
>+				for(i = 0, len = messageQueue.length; i < len; i++) {
>+					item = messageQueue[i];
>+					if(TRACE) {
>+						console.log("clearing MESSAGE queue: "+JSON.stringify(item.msg));
>+					}
>+					ternWorker.postMessage(item.msg, item.f);
> 				}
>-				ternWorker.postMessage(item.msg, item.f);
>+				messageQueue = [];
> 			}
>-			messageQueue = [];
> 		}
> 
>     	/**

Actions: View | Diff

Attachments on bug 488906: 260069 | 260350 | 260363 | 260364