Author: markt Date: Wed Jun 27 12:47:42 2012 New Revision: 1354472 URL: http://svn.apache.org/viewvc?rev=1354472&view=rev Log: Add finals
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsInputStream.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1354375 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1354472&r1=1354471&r2=1354472&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java Wed Jun 27 12:47:42 2012 @@ -52,7 +52,7 @@ public abstract class WebSocketServlet e private static final StringManager sm = StringManager.getManager(Constants.Package); - private Queue<MessageDigest> sha1Helpers = + private final Queue<MessageDigest> sha1Helpers = new ConcurrentLinkedQueue<MessageDigest>(); Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java?rev=1354472&r1=1354471&r2=1354472&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java Wed Jun 27 12:47:42 2012 @@ -39,9 +39,9 @@ public class WsFrame { private final boolean fin; private final int rsv; private final byte opCode; - private byte[] mask = new byte[4]; + private final byte[] mask = new byte[4]; private long payloadLength; - private ByteBuffer payload; + private final ByteBuffer payload; /** * Create the new WebSocket frame, reading data from the processor as Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsInputStream.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsInputStream.java?rev=1354472&r1=1354471&r2=1354472&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsInputStream.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsInputStream.java Wed Jun 27 12:47:42 2012 @@ -34,8 +34,8 @@ public class WsInputStream extends Input StringManager.getManager(Constants.Package); - private UpgradeProcessor<?> processor; - private WsOutbound outbound; + private final UpgradeProcessor<?> processor; + private final WsOutbound outbound; private WsFrame frame; private long remaining; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org