2013/1/31 <ma...@apache.org>: > Author: markt > Date: Thu Jan 31 14:26:29 2013 > New Revision: 1440973 > > URL: http://svn.apache.org/viewvc?rev=1440973&view=rev > Log: > Fix typos spotted by kkolinko > > Modified: > tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties > tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java > > Modified: > tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1440973&r1=1440972&r2=1440973&view=diff > ============================================================================== > --- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties > (original) > +++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Thu > Jan 31 14:26:29 2013 > @@ -21,7 +21,7 @@ messageSendStateMachine.inProgress=Messa > # frames and therefore must be 123 bytes (not characters) or less in length. > # Messages are encoded using UTF-8 where a single character may be encoded in > # as many as 4 bytes. > -wsFrame.bufferToSmall=No async message support and buffer too small. Buffer > size: [{0}], Message size: [{1}] > +wsFrame.bufferTooSmall=No async message support and buffer too small. Buffer > size: [{0}], Message size: [{1}] > wsFrame.byteToLongFail=Too many bytes ([{0}]) were provided to be converted > into a long
s/To/Too/ above as well > wsFrame.controlFragmented=A fragmented control frame was received but > control frames may not be fragmented > wsFrame.controlPayloadTooBig=A control frame was sent with a payload of size > [{0}] which is larger than the maximum permitted of 125 bytes > > Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1440973&r1=1440972&r2=1440973&view=diff > ============================================================================== > --- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original) > +++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Thu Jan 31 > 14:26:29 2013 > @@ -77,11 +77,11 @@ public abstract class WsFrameBase { > private int readPos = 0; > protected int writePos = 0; > > - public WsFrameBase(int binaryMerssageBufferSize, int > textMessageBufferSize, > + public WsFrameBase(int binaryMessageBufferSize, int > textMessageBufferSize, > WsSession wsSession) { > > - inputBuffer = new byte[binaryMerssageBufferSize]; > - messageBufferBinary = ByteBuffer.allocate(binaryMerssageBufferSize); > + inputBuffer = new byte[binaryMessageBufferSize]; > + messageBufferBinary = ByteBuffer.allocate(binaryMessageBufferSize); > messageBufferText = CharBuffer.allocate(textMessageBufferSize); > this.wsSession = wsSession; > } > @@ -410,7 +410,7 @@ public abstract class WsFrameBase { > // Ran out of message buffer - flush it > if (!usePartial()) { > CloseReason cr = new CloseReason(CloseCodes.TOO_BIG, > - sm.getString("wsFrame.bufferToSmall", > + sm.getString("wsFrame.bufferTooSmall", > Integer.valueOf( > messageBufferBinary.capacity()), > Long.valueOf(payloadLength))); > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org