From 945fc3a80e6de0038c89f53e7a5eed8102e17851 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 9 Dec 2010 23:47:57 +0000
Subject: [PATCH] Remove redundant interface definitions and fix other warnings
 (missing @Overrides) in same files

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1044171 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/ha/deploy/UndeployMessage.java | 11 ++++++++---
 java/org/apache/catalina/tribes/ByteMessage.java        |  5 +++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/ha/deploy/UndeployMessage.java b/java/org/apache/catalina/ha/deploy/UndeployMessage.java
index 768f185d8..c52727167 100644
--- a/java/org/apache/catalina/ha/deploy/UndeployMessage.java
+++ b/java/org/apache/catalina/ha/deploy/UndeployMessage.java
@@ -17,11 +17,10 @@
 
 package org.apache.catalina.ha.deploy;
 
-import java.io.Serializable;
-
 import org.apache.catalina.ha.ClusterMessage;
 import org.apache.catalina.tribes.Member;
-public class UndeployMessage implements ClusterMessage,Serializable {
+
+public class UndeployMessage implements ClusterMessage {
     private static final long serialVersionUID = 1L;
 
     private Member address;
@@ -46,26 +45,32 @@ public class UndeployMessage implements ClusterMessage,Serializable {
         this.contextPath = contextPath;
     }
 
+    @Override
     public Member getAddress() {
         return address;
     }
 
+    @Override
     public void setAddress(Member address) {
         this.address = address;
     }
 
+    @Override
     public long getTimestamp() {
         return timestamp;
     }
 
+    @Override
     public void setTimestamp(long timestamp) {
         this.timestamp = timestamp;
     }
 
+    @Override
     public String getUniqueId() {
         return uniqueId;
     }
 
+    @Override
     public void setUniqueId(String uniqueId) {
         this.uniqueId = uniqueId;
     }
diff --git a/java/org/apache/catalina/tribes/ByteMessage.java b/java/org/apache/catalina/tribes/ByteMessage.java
index 469e74620..b0828549c 100644
--- a/java/org/apache/catalina/tribes/ByteMessage.java
+++ b/java/org/apache/catalina/tribes/ByteMessage.java
@@ -20,7 +20,6 @@ import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serializable;
 
 /**
  * A byte message is not serialized and deserialized by the channel
@@ -40,7 +39,7 @@ import java.io.Serializable;
  * @version $Id$
  */
 
-public class ByteMessage implements Serializable, Externalizable {
+public class ByteMessage implements Externalizable {
     /**
      * Storage for the message to be sent
      */
@@ -83,6 +82,7 @@ public class ByteMessage implements Serializable, Externalizable {
      * @param in ObjectInput
      * @throws IOException
      */
+    @Override
     public void readExternal(ObjectInput in ) throws IOException {
         int length = in.readInt();
         message = new byte[length];
@@ -94,6 +94,7 @@ public class ByteMessage implements Serializable, Externalizable {
      * @param out ObjectOutput
      * @throws IOException
      */
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(message!=null?message.length:0);
         if ( message!=null ) out.write(message,0,message.length);
-- 
2.11.0