Author: kkolinko Date: Sun Jun 3 21:12:40 2012 New Revision: 1345780 URL: http://svn.apache.org/viewvc?rev=1345780&view=rev Log: Merged revision 1345779 from tomcat/trunk: Review of r1345737: Correct copy-pasted comments to match the method that is actually called there.
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1345779 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java?rev=1345780&r1=1345779&r2=1345780&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java Sun Jun 3 21:12:40 2012 @@ -165,7 +165,7 @@ public abstract class StreamInbound impl } private void doOnBinaryData(InputStream is) throws IOException { - // Need to call onClose using the web application's class loader + // Need to call onBinaryData using the web application's class loader Thread t = Thread.currentThread(); ClassLoader cl = t.getContextClassLoader(); t.setContextClassLoader(applicationClassLoader); @@ -178,7 +178,7 @@ public abstract class StreamInbound impl private void doOnTextData(Reader r) throws IOException { - // Need to call onClose using the web application's class loader + // Need to call onTextData using the web application's class loader Thread t = Thread.currentThread(); ClassLoader cl = t.getContextClassLoader(); t.setContextClassLoader(applicationClassLoader); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org