Author: markt
Date: Tue Aug 7 19:28:25 2012
New Revision: 1370461
URL: http://svn.apache.org/viewvc?rev=1370461&view=rev
Log:
Partial code clean-up for o.a.catalina.tribes
- Add final prompted by UCDetector
- Java 7 use of <>
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/RxTaskPool.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/SenderState.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java?rev=1370461&r1=1370460&r2=1370461&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
Tue Aug 7 19:28:25 2012
@@ -40,7 +40,7 @@ public abstract class PooledSender exten
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
- private SenderQueue queue = null;
+ private final SenderQueue queue;
private int poolSize = 25;
public PooledSender() {
queue = new SenderQueue(this,poolSize);
@@ -123,8 +123,8 @@ public abstract class PooledSender exten
public SenderQueue(PooledSender parent, int limit) {
this.limit = limit;
this.parent = parent;
- notinuse = new java.util.LinkedList<DataSender>();
- inuse = new java.util.LinkedList<DataSender>();
+ notinuse = new java.util.LinkedList<>();
+ inuse = new java.util.LinkedList<>();
}
/**
Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/RxTaskPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/RxTaskPool.java?rev=1370461&r1=1370460&r2=1370461&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/RxTaskPool.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/RxTaskPool.java Tue
Aug 7 19:28:25 2012
@@ -33,16 +33,16 @@ public class RxTaskPool
* through a FIFO idle queue.
*/
- List<AbstractRxTask> idle = new LinkedList<AbstractRxTask>();
- List<AbstractRxTask> used = new LinkedList<AbstractRxTask>();
+ final List<AbstractRxTask> idle = new LinkedList<>();
+ final List<AbstractRxTask> used = new LinkedList<>();
- Object mutex = new Object();
+ final Object mutex = new Object();
boolean running = true;
private int maxTasks;
private int minTasks;
- private TaskCreator creator = null;
+ private final TaskCreator creator;
public RxTaskPool (int maxTasks, int minTasks, TaskCreator creator) throws
Exception {
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/SenderState.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/SenderState.java?rev=1370461&r1=1370460&r2=1370461&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/SenderState.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/SenderState.java Tue
Aug 7 19:28:25 2012
@@ -35,7 +35,8 @@ public class SenderState {
public static final int SUSPECT = 1;
public static final int FAILING = 2;
- protected static HashMap<Member, SenderState> memberStates = new
HashMap<Member, SenderState>();
+ protected static final HashMap<Member, SenderState> memberStates =
+ new HashMap<>();
public static SenderState getSenderState(Member member) {
return getSenderState(member,true);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
