Author: markt
Date: Sun Jul 22 19:46:16 2012
New Revision: 1364411
URL: http://svn.apache.org/viewvc?rev=1364411&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/FragmentationInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java?rev=1364411&r1=1364410&r2=1364411&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
Sun Jul 22 19:46:16 2012
@@ -44,10 +44,10 @@ import org.apache.catalina.tribes.io.XBy
public class FragmentationInterceptor extends ChannelInterceptorBase {
private static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory.getLog( FragmentationInterceptor.class );
- protected HashMap<FragKey, FragCollection> fragpieces = new
HashMap<FragKey, FragCollection>();
+ protected final HashMap<FragKey, FragCollection> fragpieces = new
HashMap<>();
private int maxSize = 1024*100;
private long expire = 1000 * 60; //one minute expiration
- protected boolean deepclone = true;
+ protected final boolean deepclone = true;
@Override
@@ -172,9 +172,9 @@ public class FragmentationInterceptor ex
}
public static class FragCollection {
- private long received = System.currentTimeMillis();
- private ChannelMessage msg;
- private XByteBuffer[] frags;
+ private final long received = System.currentTimeMillis();
+ private final ChannelMessage msg;
+ private final XByteBuffer[] frags;
public FragCollection(ChannelMessage msg) {
//get the total messages
int count =
XByteBuffer.toInt(msg.getMessage().getBytesDirect(),msg.getMessage().getLength()-4);
@@ -214,13 +214,11 @@ public class FragmentationInterceptor ex
public boolean expired(long expire) {
return (System.currentTimeMillis()-received)>expire;
}
-
-
}
public static class FragKey {
- private byte[] uniqueId;
- private long received = System.currentTimeMillis();
+ private final byte[] uniqueId;
+ private final long received = System.currentTimeMillis();
public FragKey(byte[] id ) {
this.uniqueId = id;
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java?rev=1364411&r1=1364410&r2=1364411&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
Sun Jul 22 19:46:16 2012
@@ -39,12 +39,13 @@ import org.apache.catalina.tribes.util.T
public class MessageDispatch15Interceptor extends MessageDispatchInterceptor {
- protected AtomicLong currentSize = new AtomicLong(0);
+ protected final AtomicLong currentSize = new AtomicLong(0);
protected ThreadPoolExecutor executor = null;
protected int maxThreads = 10;
protected int maxSpareThreads = 2;
protected long keepAliveTime = 5000;
- protected LinkedBlockingQueue<Runnable> runnablequeue = new
LinkedBlockingQueue<Runnable>();
+ protected final LinkedBlockingQueue<Runnable> runnablequeue =
+ new LinkedBlockingQueue<>();
@Override
public long getCurrentSize() {
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=1364411&r1=1364410&r2=1364411&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
Sun Jul 22 19:46:16 2012
@@ -44,7 +44,7 @@ public class MessageDispatchInterceptor
private static final Log log =
LogFactory.getLog(MessageDispatchInterceptor.class);
protected long maxQueueSize = 1024*1024*64; //64MB
- protected FastQueue queue = new FastQueue();
+ protected final FastQueue queue = new FastQueue();
protected volatile boolean run = false;
protected Thread msgDispatchThread = null;
protected long currentSize = 0;
@@ -217,6 +217,4 @@ public class MessageDispatchInterceptor
public void setAlwaysSend(boolean alwaysSend) {
this.alwaysSend = alwaysSend;
}
-
-
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java?rev=1364411&r1=1364410&r2=1364411&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
Sun Jul 22 19:46:16 2012
@@ -148,7 +148,7 @@ public class NonBlockingCoordinator exte
/**
* Time to wait for coordination timeout
*/
- protected long waitForCoordMsgTimeout = 15000;
+ protected final long waitForCoordMsgTimeout = 15000;
/**
* Our current view
*/
@@ -173,9 +173,9 @@ public class NonBlockingCoordinator exte
protected boolean started = false;
protected final int startsvc = 0xFFFF;
- protected Object electionMutex = new Object();
+ protected final Object electionMutex = new Object();
- protected AtomicBoolean coordMsgReceived = new AtomicBoolean(false);
+ protected final AtomicBoolean coordMsgReceived = new AtomicBoolean(false);
public NonBlockingCoordinator() {
super();
@@ -622,7 +622,7 @@ public class NonBlockingCoordinator exte
public static class CoordinationMessage {
//X{A-ldr, A-src, mbrs-A,B,C,D}
- protected XByteBuffer buf;
+ protected final XByteBuffer buf;
protected MemberImpl leader;
protected MemberImpl source;
protected MemberImpl[] view;
@@ -770,13 +770,13 @@ public class NonBlockingCoordinator exte
public static final int EVT_CONF_RX = 12;
public static final int EVT_ELECT_ABANDONED = 13;
- int type;
- ChannelInterceptor interceptor;
- Member coord;
- Member[] mbrs;
- String info;
- Membership view;
- Membership suggestedView;
+ final int type;
+ final ChannelInterceptor interceptor;
+ final Member coord;
+ final Member[] mbrs;
+ final String info;
+ final Membership view;
+ final Membership suggestedView;
public CoordinationEvent(int type,ChannelInterceptor interceptor,
String info) {
this.type = type;
this.interceptor = interceptor;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
