Skip to content
This repository was archived by the owner on Nov 29, 2020. It is now read-only.

Commit

Permalink
Code clean-up for o.a.catalina.ha.tcp
Browse files Browse the repository at this point in the history
 - Add final prompted by UCDetector
 - Java 7 use of <>

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1361421 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
markt-asf committed Jul 13, 2012
1 parent 07af79b commit 433ff1c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 31 deletions.
4 changes: 2 additions & 2 deletions java/org/apache/catalina/ha/tcp/ReplicationValve.java
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ public class ReplicationValve
/**
* crossContext session container
*/
protected ThreadLocal<ArrayList<DeltaSession>> crossContextSessions =
new ThreadLocal<ArrayList<DeltaSession>>() ;
protected final ThreadLocal<ArrayList<DeltaSession>> crossContextSessions =
new ThreadLocal<>() ;

/**
* doProcessingStats (default = off)
Expand Down
18 changes: 0 additions & 18 deletions java/org/apache/catalina/ha/tcp/SendMessageData.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,34 +49,16 @@ public SendMessageData(Object message, Member destination,
public Member getDestination() {
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;
}
}
16 changes: 5 additions & 11 deletions java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,6 @@ public class SimpleTcpCluster extends LifecycleBase
protected Channel channel = new GroupChannel();


/**
* Name for logging purpose
*/
protected String clusterImpName = "SimpleTcpCluster";

/**
* The string manager for this package.
*/
Expand All @@ -136,24 +131,23 @@ public class SimpleTcpCluster extends LifecycleBase
/**
* 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<String, ClusterManager> managers =
new HashMap<String, ClusterManager>();
protected final Map<String, ClusterManager> managers = new HashMap<>();

protected ClusterManager managerTemplate = new DeltaManager();

private List<Valve> valves = new ArrayList<Valve>();
private final List<Valve> valves = new ArrayList<>();

private org.apache.catalina.ha.ClusterDeployer clusterDeployer;

/**
* Listeners of messages
*/
protected List<ClusterListener> clusterListeners = new ArrayList<ClusterListener>();
protected final List<ClusterListener> clusterListeners = new ArrayList<>();

/**
* Comment for <code>notifyLifecycleListenerOnFailure</code>
Expand All @@ -163,7 +157,7 @@ public class SimpleTcpCluster extends LifecycleBase
/**
* dynamic sender <code>properties</code>
*/
private Map<String, Object> properties = new HashMap<String, Object>();
private final Map<String, Object> properties = new HashMap<>();

private int channelSendOptions = Channel.SEND_OPTIONS_ASYNCHRONOUS;

Expand Down

0 comments on commit 433ff1c

Please sign in to comment.