Fix Eclipse warnings in package

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1044175 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/ha/backend/CollectedInfo.java b/java/org/apache/catalina/ha/backend/CollectedInfo.java
index c335492..c4da0f5 100644 (file)
--- a/java/org/apache/catalina/ha/backend/CollectedInfo.java
+++ b/java/org/apache/catalina/ha/backend/CollectedInfo.java
@@ -101,6 +101,6 @@ public class CollectedInfo {
         Integer ibusy  = (Integer) mBeanServer.getAttribute(objName, "currentThreadsBusy");
 
         busy = ibusy.intValue();
-        ready = imax.intValue() - ibusy;
+        ready = imax.intValue() - ibusy.intValue();
     }
 }

diff --git a/java/org/apache/catalina/ha/backend/HeartbeatListener.java b/java/org/apache/catalina/ha/backend/HeartbeatListener.java
index fe113d6..9bfd426 100644 (file)
--- a/java/org/apache/catalina/ha/backend/HeartbeatListener.java
+++ b/java/org/apache/catalina/ha/backend/HeartbeatListener.java
@@ -74,9 +74,11 @@ public class HeartbeatListener
 
     private Sender sender = null;
 
+    @Override
     public void containerEvent(ContainerEvent event) {
     }
 
+    @Override
     public void lifecycleEvent(LifecycleEvent event) {
 
         if (Lifecycle.PERIODIC_EVENT.equals(event.getType())) {

diff --git a/java/org/apache/catalina/ha/backend/MultiCastSender.java b/java/org/apache/catalina/ha/backend/MultiCastSender.java
index 9ce2f55..bbb5612 100644 (file)
--- a/java/org/apache/catalina/ha/backend/MultiCastSender.java
+++ b/java/org/apache/catalina/ha/backend/MultiCastSender.java
@@ -41,10 +41,12 @@ public class MultiCastSender
     MulticastSocket s = null;
     InetAddress group = null;
 
+    @Override
     public void init(HeartbeatListener config) throws Exception {
         this.config = config;
     }
 
+    @Override
     public int send(String mess) throws Exception {
         if (s == null) {
             try {

diff --git a/java/org/apache/catalina/ha/backend/Proxy.java b/java/org/apache/catalina/ha/backend/Proxy.java
index afe9bdb..e6dfc4b 100644 (file)
--- a/java/org/apache/catalina/ha/backend/Proxy.java
+++ b/java/org/apache/catalina/ha/backend/Proxy.java
@@ -26,7 +26,7 @@ import java.net.InetAddress;
  */
 public class Proxy {
 
-  protected enum State { OK, ERROR, DOWN };
+  protected enum State { OK, ERROR, DOWN }
 
   public InetAddress address = null;
   public int port = 80;

diff --git a/java/org/apache/catalina/ha/backend/TcpSender.java b/java/org/apache/catalina/ha/backend/TcpSender.java
index 8ce18d8..2ee0a20 100644 (file)
--- a/java/org/apache/catalina/ha/backend/TcpSender.java
+++ b/java/org/apache/catalina/ha/backend/TcpSender.java
@@ -56,6 +56,7 @@ public class TcpSender
     protected BufferedWriter[] connectionWriters = null;
 
 
+    @Override
     public void init(HeartbeatListener config) throws Exception {
         this.config = config;
         StringTokenizer tok = new StringTokenizer(config.getProxyList(), ",");
@@ -81,6 +82,7 @@ public class TcpSender
 
     }
 
+    @Override
     public int send(String mess) throws Exception {
         if (connections == null) {
             log.error("Not initialized");