Author: markt
Date: Fri Jul 13 21:20:48 2012
New Revision: 1361404
URL: http://svn.apache.org/viewvc?rev=1361404&view=rev
Log:
UCDetector clean-up
- Remove unused code
- Use final where appropriate
Modified:
tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java
tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java
tomcat/trunk/java/org/apache/catalina/ha/backend/Proxy.java
tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java?rev=1361404&r1=1361403&r2=1361404&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java Fri
Jul 13 21:20:48 2012
@@ -33,42 +33,35 @@ import org.apache.juli.logging.LogFactor
* what about the bind(IP. port) only IP makes sense (for the moment).
* BTW:v = version :-)
*/
-public class HeartbeatListener
- implements LifecycleListener, ContainerListener {
+public class HeartbeatListener implements LifecycleListener, ContainerListener
{
private static final Log log = LogFactory.getLog(HeartbeatListener.class);
/* To allow to select the connector */
- int port = 0;
- String host = null;
- public void setHost(String host) { this.host = host; }
- public void setPort(int port) { this.port = port; }
+ private int port = 0;
+ private String host = null;
/* for multicasting stuff */
- String ip = "224.0.1.105"; /* Multicast IP */
- int multiport = 23364; /* Multicast Port */
- int ttl = 16;
+ private final String ip = "224.0.1.105"; /* Multicast IP */
+ private final int multiport = 23364; /* Multicast Port */
+ private final int ttl = 16;
- public void setGroup(String ip) { this.ip = ip; }
+ public String getHost() { return host; }
public String getGroup() { return ip; }
- public void setMultiport(int multiport) { this.multiport = multiport; }
public int getMultiport() { return multiport; }
- public void setTtl(int ttl) { this.ttl = ttl; }
public int getTtl() { return ttl; }
/**
* Proxy list, format "address:port,address:port".
*/
- protected String proxyList = null;
+ private final String proxyList = null;
public String getProxyList() { return proxyList; }
- public void setProxyList(String proxyList) { this.proxyList = proxyList; }
/**
* URL prefix.
*/
- protected String proxyURL = "/HeartbeatListener";
+ private final String proxyURL = "/HeartbeatListener";
public String getProxyURL() { return proxyURL; }
- public void setProxyURL(String proxyURL) { this.proxyURL = proxyURL; }
private CollectedInfo coll = null;
Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java?rev=1361404&r1=1361403&r2=1361404&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java Fri
Jul 13 21:20:48 2012
@@ -52,8 +52,8 @@ public class MultiCastSender
if (s == null) {
try {
group = InetAddress.getByName(config.getGroup());
- if (config.host != null) {
- InetAddress addr = InetAddress.getByName(config.host);
+ if (config.getHost() != null) {
+ InetAddress addr =
InetAddress.getByName(config.getHost());
InetSocketAddress addrs = new InetSocketAddress(addr,
config.getMultiport());
s = new MulticastSocket(addrs);
} else
Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/Proxy.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/Proxy.java?rev=1361404&r1=1361403&r2=1361404&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/backend/Proxy.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/Proxy.java Fri Jul 13
21:20:48 2012
@@ -26,9 +26,6 @@ import java.net.InetAddress;
*/
public class Proxy {
- protected enum State { OK, ERROR, DOWN }
-
public InetAddress address = null;
public int port = 80;
- public State state = State.OK;
}
Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java?rev=1361404&r1=1361403&r2=1361404&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java Fri Jul 13
21:20:48 2012
@@ -93,9 +93,9 @@ public class TcpSender
for (int i = 0; i < connections.length; i++) {
if (connections[i] == null) {
try {
- if (config.host != null) {
+ if (config.getHost() != null) {
connections[i] = new Socket();
- InetAddress addr = InetAddress.getByName(config.host);
+ InetAddress addr =
InetAddress.getByName(config.getHost());
InetSocketAddress addrs = new InetSocketAddress(addr,
0);
connections[i].setReuseAddress(true);
connections[i].bind(addrs);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
