You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/02/20 13:58:48 UTC
svn commit: r1448141 - in /tomcat/trunk/java/org/apache/tomcat/websocket:
WsFrameBase.java WsFrameClient.java server/ServerContainerImpl.java
server/UriTemplate.java server/WsRemoteEndpointServer.java
Author: markt
Date: Wed Feb 20 12:58:46 2013
New Revision: 1448141
URL: http://svn.apache.org/r1448141
Log:
UCDetector: use final
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
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=1448141&r1=1448140&r2=1448141&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Wed Feb 20 12:58:46 2013
@@ -67,7 +67,7 @@ public abstract class WsFrameBase {
private boolean fin = false;
private int rsv = 0;
private byte opCode = 0;
- private byte[] mask = new byte[4];
+ private final byte[] mask = new byte[4];
private int maskIndex = 0;
private long payloadLength = 0;
private long payloadWritten = 0;
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java?rev=1448141&r1=1448140&r2=1448141&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java Wed Feb 20 12:58:46 2013
@@ -26,8 +26,8 @@ import javax.websocket.CloseReason.Close
public class WsFrameClient extends WsFrameBase {
- private ByteBuffer response;
- private AsynchronousSocketChannel channel;
+ private final ByteBuffer response;
+ private final AsynchronousSocketChannel channel;
private final CompletionHandler<Integer,Void> handler;
public WsFrameClient(ByteBuffer response, AsynchronousSocketChannel channel,
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java?rev=1448141&r1=1448140&r2=1448141&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java Wed Feb 20 12:58:46 2013
@@ -51,12 +51,12 @@ public class ServerContainerImpl extends
// Needs to be a WeakHashMap to prevent memory leaks when a context is
// stopped
- private static Map<ClassLoader,ServerContainerImpl> classLoaderContainerMap =
- new WeakHashMap<>();
- private static Object classLoaderContainerMapLock = new Object();
- private static StringManager sm =
+ private static final Map<ClassLoader,ServerContainerImpl>
+ classLoaderContainerMap = new WeakHashMap<>();
+ private static final Object classLoaderContainerMapLock = new Object();
+ private static final StringManager sm =
StringManager.getManager(Constants.PACKAGE_NAME);
- protected final Log log = LogFactory.getLog(ServerContainerImpl.class);
+ private final Log log = LogFactory.getLog(ServerContainerImpl.class);
public static ServerContainerImpl getServerContainer() {
@@ -75,12 +75,12 @@ public class ServerContainerImpl extends
private final WsWriteTimeout wsWriteTimeout = new WsWriteTimeout();
private volatile ServletContext servletContext = null;
- private Map<String,ServerEndpointConfiguration> configMap =
+ private final Map<String,ServerEndpointConfiguration> configMap =
new ConcurrentHashMap<>();
- private Map<String,UriTemplate> templateMap =
+ private final Map<String,UriTemplate> templateMap =
new ConcurrentHashMap<>();
- private Map<String,Class<?>> pojoMap = new ConcurrentHashMap<>();
- private Map<Class<?>,PojoMethodMapping> pojoMethodMap =
+ private final Map<String,Class<?>> pojoMap = new ConcurrentHashMap<>();
+ private final Map<Class<?>,PojoMethodMapping> pojoMethodMap =
new ConcurrentHashMap<>();
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java?rev=1448141&r1=1448140&r2=1448141&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java Wed Feb 20 12:58:46 2013
@@ -32,7 +32,7 @@ import org.apache.tomcat.util.res.String
*/
public class UriTemplate {
- private static StringManager sm =
+ private static final StringManager sm =
StringManager.getManager(Constants.PACKAGE_NAME);
private final String template;
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java?rev=1448141&r1=1448140&r2=1448141&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java Wed Feb 20 12:58:46 2013
@@ -36,7 +36,7 @@ import org.apache.tomcat.websocket.WsRem
*/
public class WsRemoteEndpointServer extends WsRemoteEndpointBase {
- private static StringManager sm =
+ private static final StringManager sm =
StringManager.getManager(Constants.PACKAGE_NAME);
private static final Log log =
LogFactory.getLog(WsProtocolHandler.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org