Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6DC7BC69D for ; Fri, 13 Jul 2012 22:20:43 +0000 (UTC) Received: (qmail 71644 invoked by uid 500); 13 Jul 2012 22:20:42 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 71586 invoked by uid 500); 13 Jul 2012 22:20:42 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 71577 invoked by uid 99); 13 Jul 2012 22:20:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jul 2012 22:20:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jul 2012 22:20:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A26CF2388860 for ; Fri, 13 Jul 2012 22:20:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1361421 - in /tomcat/trunk/java/org/apache/catalina/ha/tcp: ReplicationValve.java SendMessageData.java SimpleTcpCluster.java Date: Fri, 13 Jul 2012 22:20:19 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120713222019.A26CF2388860@eris.apache.org> Author: markt Date: Fri Jul 13 22:20:19 2012 New Revision: 1361421 URL: http://svn.apache.org/viewvc?rev=1361421&view=rev Log: Code clean-up for o.a.catalina.ha.tcp - Add final prompted by UCDetector - Java 7 use of <> Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java tomcat/trunk/java/org/apache/catalina/ha/tcp/SendMessageData.java tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java?rev=1361421&r1=1361420&r2=1361421&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java Fri Jul 13 22:20:19 2012 @@ -85,8 +85,8 @@ public class ReplicationValve /** * crossContext session container */ - protected ThreadLocal> crossContextSessions = - new ThreadLocal>() ; + protected final ThreadLocal> crossContextSessions = + new ThreadLocal<>() ; /** * doProcessingStats (default = off) Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SendMessageData.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SendMessageData.java?rev=1361421&r1=1361420&r2=1361421&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/tcp/SendMessageData.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SendMessageData.java Fri Jul 13 22:20:19 2012 @@ -50,33 +50,15 @@ public class SendMessageData { return destination; } /** - * @param destination The destination to set. - */ - public void setDestination(Member destination) { - this.destination = destination; - } - /** * @return Returns the exception. */ public Exception getException() { return exception; } /** - * @param exception The exception to set. - */ - public void setException(Exception exception) { - this.exception = exception; - } - /** * @return Returns the message. */ public Object getMessage() { return message; } - /** - * @param message The message to set. - */ - public void setMessage(Object message) { - this.message = message; - } } Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1361421&r1=1361420&r2=1361421&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Fri Jul 13 22:20:19 2012 @@ -108,11 +108,6 @@ public class SimpleTcpCluster extends Li /** - * Name for logging purpose - */ - protected String clusterImpName = "SimpleTcpCluster"; - - /** * The string manager for this package. */ protected static final StringManager sm = StringManager.getManager(Constants.Package); @@ -136,24 +131,23 @@ public class SimpleTcpCluster extends Li /** * The property change support for this component. */ - protected PropertyChangeSupport support = new PropertyChangeSupport(this); + protected final PropertyChangeSupport support = new PropertyChangeSupport(this); /** * The context name <->manager association for distributed contexts. */ - protected Map managers = - new HashMap(); + protected final Map managers = new HashMap<>(); protected ClusterManager managerTemplate = new DeltaManager(); - private List valves = new ArrayList(); + private final List valves = new ArrayList<>(); private org.apache.catalina.ha.ClusterDeployer clusterDeployer; /** * Listeners of messages */ - protected List clusterListeners = new ArrayList(); + protected final List clusterListeners = new ArrayList<>(); /** * Comment for notifyLifecycleListenerOnFailure @@ -163,7 +157,7 @@ public class SimpleTcpCluster extends Li /** * dynamic sender properties */ - private Map properties = new HashMap(); + private final Map properties = new HashMap<>(); private int channelSendOptions = Channel.SEND_OPTIONS_ASYNCHRONOUS; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org