fix for starting an EvHttpServer after EvenManager is active

IoLanguage · Dec 22, 2009 · d2e9b90 · d2e9b90
1 parent fb97865
commit d2e9b90
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/addons/Socket/io/A0_EventManager.io b/addons/Socket/io/A0_EventManager.io
@@ -121,9 +121,8 @@ EventManager do(
 		if(coro, coro resumeLater, self coro := coroFor(run); coro setLabel("EventManager"); coro resumeLater)	
 	)
 
-	//doc EventManager run Runs the EventManger loop. Does not return.
+	//doc EventManager run Runs the EventManger loop. Does not return. Private - should only be called by resumeIfNeeded.
 	run := method(
-		if(coro == nil, resumeIfNeeded; return)
 		//Scheduler currentCoroutine setLabel("EventManager")
 		//writeln("EventManager run")
 		setShouldRun(true)
@@ -138,8 +137,6 @@ EventManager do(
 				)
 				*/
 
-				//listenUntilEvent
-
 				er := if(Coroutine yieldingCoros first, listen, if(listensUntilEvent, listenUntilEvent, listen)) 
 				er ifError(e, Exception raise("Unrecoverable Error in EventManager: " .. e description))
 

diff --git a/addons/Socket/io/EvHttpServer.io b/addons/Socket/io/EvHttpServer.io
@@ -79,7 +79,7 @@ EvHttpServer do(
 	responseProto := EvOutResponse
 
 	run := method(
-		EventManager run
+		EventManager resumeIfNeeded
 		start
 		self
 	)