Author: markt
Date: Tue Aug 7 19:52:06 2012
New Revision: 1370472
URL: http://svn.apache.org/viewvc?rev=1370472&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/ChannelException.java
tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java?rev=1370472&r1=1370471&r2=1370472&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java Tue Aug
7 19:52:06 2012
@@ -123,7 +123,7 @@ public class ChannelException extends Ex
* @param mbr FaultyMember
*/
public boolean addFaultyMember(FaultyMember mbr) {
- if ( this.faultyMembers==null ) this.faultyMembers = new
ArrayList<FaultyMember>();
+ if ( this.faultyMembers==null ) this.faultyMembers = new ArrayList<>();
if ( !faultyMembers.contains(mbr) ) return faultyMembers.add(mbr);
else return false;
}
@@ -148,8 +148,8 @@ public class ChannelException extends Ex
* @version 1.0
*/
public static class FaultyMember {
- protected Exception cause;
- protected Member member;
+ protected final Exception cause;
+ protected final Member member;
public FaultyMember(Member mbr, Exception x) {
this.member = mbr;
this.cause = x;
Modified: tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java?rev=1370472&r1=1370471&r2=1370472&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java Tue Aug 7
19:52:06 2012
@@ -31,9 +31,10 @@ import org.apache.catalina.tribes.util.A
public final class UniqueId implements Serializable{
private static final long serialVersionUID = 1L;
- protected byte[] id;
+ protected final byte[] id;
public UniqueId() {
+ this(null);
}
public UniqueId(byte[] id) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
