Author: kpreisser Date: Tue Oct 29 19:04:23 2013 New Revision: 1536855 URL: http://svn.apache.org/r1536855 Log: Merged revision(s) 1536850, 1536852 from tomcat/trunk: Follow-Up to r1536834: Use correct order of initialization methods.
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/examples/websocket/drawboard.xhtml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1536850,1536852 Modified: tomcat/tc7.0.x/trunk/webapps/examples/websocket/drawboard.xhtml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/websocket/drawboard.xhtml?rev=1536855&r1=1536854&r2=1536855&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/examples/websocket/drawboard.xhtml (original) +++ tomcat/tc7.0.x/trunk/webapps/examples/websocket/drawboard.xhtml Tue Oct 29 19:04:23 2013 @@ -451,12 +451,12 @@ canvasBackgroundCtx.drawImage(canvasServerImage, 0, 0); - // Refresh the display canvas. - refreshDisplayCanvas(); - isStarted = true; startControls(); + // Refresh the display canvas. + refreshDisplayCanvas(); + // Finally, resume the event forwarder. eventForwarder.resumeProcessing(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org