Author: markt
Date: Sun Jul 22 19:53:06 2012
New Revision: 1364416
URL: http://svn.apache.org/viewvc?rev=1364416&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/group/interceptors/OrderInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java?rev=1364416&r1=1364415&r2=1364416&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
Sun Jul 22 19:53:06 2012
@@ -54,9 +54,9 @@ import org.apache.catalina.tribes.io.XBy
* @version 1.1
*/
public class OrderInterceptor extends ChannelInterceptorBase {
- private HashMap<Member, Counter> outcounter = new HashMap<Member,
Counter>();
- private HashMap<Member, Counter> incounter = new HashMap<Member,
Counter>();
- private HashMap<Member, MessageOrder> incoming = new HashMap<Member,
MessageOrder>();
+ private final HashMap<Member, Counter> outcounter = new HashMap<>();
+ private final HashMap<Member, Counter> incounter = new HashMap<>();
+ private final HashMap<Member, MessageOrder> incoming = new HashMap<>();
private long expire = 3000;
private boolean forwardExpired = true;
private int maxQueue = Integer.MAX_VALUE;
@@ -212,7 +212,7 @@ public class OrderInterceptor extends Ch
}
protected static class Counter {
- private AtomicInteger value = new AtomicInteger(0);
+ private final AtomicInteger value = new AtomicInteger(0);
public int getCounter() {
return value.get();
@@ -228,9 +228,9 @@ public class OrderInterceptor extends Ch
}
protected static class MessageOrder {
- private long received = System.currentTimeMillis();
+ private final long received = System.currentTimeMillis();
private MessageOrder next;
- private int msgNr;
+ private final int msgNr;
private ChannelMessage msg = null;
public MessageOrder(int msgNr,ChannelMessage msg) {
this.msgNr = msgNr;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java?rev=1364416&r1=1364415&r2=1364416&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
Sun Jul 22 19:53:06 2012
@@ -35,7 +35,7 @@ public class SimpleCoordinator extends C
private Member[] view;
- private AtomicBoolean membershipChanged = new AtomicBoolean();
+ private final AtomicBoolean membershipChanged = new AtomicBoolean();
private void membershipChanged() {
membershipChanged.set(true);
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java?rev=1364416&r1=1364415&r2=1364416&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
Sun Jul 22 19:53:06 2012
@@ -26,7 +26,7 @@ import org.apache.catalina.tribes.group.
public class StaticMembershipInterceptor
extends ChannelInterceptorBase {
- protected ArrayList<Member> members = new ArrayList<Member>();
+ protected final ArrayList<Member> members = new ArrayList<>();
protected Member localMember = null;
public StaticMembershipInterceptor() {
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?rev=1364416&r1=1364415&r2=1364416&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
Sun Jul 22 19:53:06 2012
@@ -61,7 +61,7 @@ public class TcpFailureDetector extends
private static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory.getLog( TcpFailureDetector.class );
- protected static byte[] TCP_FAIL_DETECT = new byte[] {
+ protected static final byte[] TCP_FAIL_DETECT = new byte[] {
79, -89, 115, 72, 121, -126, 67, -55, -97, 111, -119, -128, -95, 91,
7, 20,
125, -39, 82, 91, -21, -15, 67, -102, -73, 126, -66, -113, -127, 103,
30, -74,
55, 21, -66, -121, 69, 126, 76, -88, -65, 10, 77, 19, 83, 56, 21, 50,
@@ -79,9 +79,9 @@ public class TcpFailureDetector extends
protected Membership membership = null;
- protected HashMap<Member, Long> removeSuspects = new HashMap<Member,
Long>();
+ protected final HashMap<Member, Long> removeSuspects = new HashMap<>();
- protected HashMap<Member, Long> addSuspects = new HashMap<Member, Long>();
+ protected final HashMap<Member, Long> addSuspects = new HashMap<>();
@Override
public void sendMessage(Member[] destination, ChannelMessage msg,
InterceptorPayload payload) throws ChannelException {
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java?rev=1364416&r1=1364415&r2=1364416&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
Sun Jul 22 19:53:06 2012
@@ -43,7 +43,7 @@ public class TcpPingInterceptor extends
private static final Log log = LogFactory.getLog(TcpPingInterceptor.class);
- protected static byte[] TCP_PING_DATA = new byte[] {
+ protected static final byte[] TCP_PING_DATA = new byte[] {
79, -89, 115, 72, 121, -33, 67, -55, -97, 111, -119, -128, -95, 91, 7,
20,
125, -39, 82, 91, -21, -33, 67, -102, -73, 126, -66, -113, -127, 103,
30, -74,
55, 21, -66, -121, 69, 33, 76, -88, -65, 10, 77, 19, 83, 56, 21, 50,
@@ -55,7 +55,7 @@ public class TcpPingInterceptor extends
protected boolean staticOnly = false;
protected volatile boolean running = true;
protected PingThread thread = null;
- protected static AtomicInteger cnt = new AtomicInteger(0);
+ protected static final AtomicInteger cnt = new AtomicInteger(0);
WeakReference<TcpFailureDetector> failureDetector = null;
WeakReference<StaticMembershipInterceptor> staticMembers = null;
@@ -75,9 +75,9 @@ public class TcpPingInterceptor extends
ChannelInterceptor next = getNext();
while ( next != null ) {
if ( next instanceof TcpFailureDetector )
- failureDetector = new
WeakReference<TcpFailureDetector>((TcpFailureDetector)next);
+ failureDetector = new
WeakReference<>((TcpFailureDetector)next);
if ( next instanceof StaticMembershipInterceptor )
- staticMembers = new
WeakReference<StaticMembershipInterceptor>((StaticMembershipInterceptor)next);
+ staticMembers = new
WeakReference<>((StaticMembershipInterceptor)next);
next = next.getNext();
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java?rev=1364416&r1=1364415&r2=1364416&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
Sun Jul 22 19:53:06 2012
@@ -46,14 +46,14 @@ public class ThroughputInterceptor exten
double mbRx = 0;
double timeTx = 0;
double lastCnt = 0;
- AtomicLong msgTxCnt = new AtomicLong(1);
- AtomicLong msgRxCnt = new AtomicLong(0);
- AtomicLong msgTxErr = new AtomicLong(0);
+ final AtomicLong msgTxCnt = new AtomicLong(1);
+ final AtomicLong msgRxCnt = new AtomicLong(0);
+ final AtomicLong msgTxErr = new AtomicLong(0);
int interval = 10000;
- AtomicInteger access = new AtomicInteger(0);
+ final AtomicInteger access = new AtomicInteger(0);
long txStart = 0;
long rxStart = 0;
- DecimalFormat df = new DecimalFormat("#0.00");
+ final DecimalFormat df = new DecimalFormat("#0.00");
@Override
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java?rev=1364416&r1=1364415&r2=1364416&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
Sun Jul 22 19:53:06 2012
@@ -44,7 +44,7 @@ public class TwoPhaseCommitInterceptor e
private static final byte[] END_DATA = new byte[] {54, -13, 90, 110, 47,
-31, 75, -24, -81, -29, 36, 52, -58, 77, -110, 56};
private static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory.getLog(TwoPhaseCommitInterceptor.class);
- protected HashMap<UniqueId, MapEntry> messages = new HashMap<UniqueId,
MapEntry>();
+ protected final HashMap<UniqueId, MapEntry> messages = new HashMap<>();
protected long expire = 1000 * 60; //one minute expiration
protected boolean deepclone = true;
@@ -116,7 +116,6 @@ public class TwoPhaseCommitInterceptor e
public void heartbeat() {
try {
long now = System.currentTimeMillis();
- @SuppressWarnings("unchecked")
Map.Entry<UniqueId,MapEntry>[] entries =
messages.entrySet().toArray(new Map.Entry[messages.size()]);
for (int i=0; i<entries.length; i++ ) {
MapEntry entry = entries[i].getValue();
@@ -134,9 +133,9 @@ public class TwoPhaseCommitInterceptor e
}
public static class MapEntry {
- public ChannelMessage msg;
- public UniqueId id;
- public long timestamp;
+ public final ChannelMessage msg;
+ public final UniqueId id;
+ public final long timestamp;
public MapEntry(ChannelMessage msg, UniqueId id, long timestamp) {
this.msg = msg;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
