Author: kkolinko
Date: Mon Nov 4 23:09:10 2013
New Revision: 1538799
URL: http://svn.apache.org/r1538799
Log:
Merged r1537057 from tomcat/trunk:
Review of r1537041:
a pair of typos.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1537057
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1538799&r1=1538798&r2=1538799&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Mon Nov 4 23:09:10 2013
@@ -129,7 +129,7 @@ public class WsRemoteEndpointImplServer
protected void doClose() {
if (handler != null) {
// close() can be triggered by a wide range of scenarios. It is far
- // simpler just to always use a dispatch that it is to try and
track
+ // simpler just to always use a dispatch than it is to try and
track
// whether or not this method was called by the same thread that
// triggered the write
clearHandler(new EOFException(), true);
Modified: tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml?rev=1538799&r1=1538798&r2=1538799&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml Mon Nov 4 23:09:10
2013
@@ -85,7 +85,7 @@
property to <code>true</code> but any explicit setting on the servlet
context
will always take priority.</p>
-<p>The Java WebSocket 1.0 specification requires that call backs for
+<p>The Java WebSocket 1.0 specification requires that callbacks for
asynchronous writes are performed on a different thread to the thread that
initiated the write. Since the container thread pool is not exposed via the
Servlet API, the WebSocket implementation has to provide its own thread
pool.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
