From 7cf1ac39a3d130799ca803985f64bc415e866cde Mon Sep 17 00:00:00 2001 From: kkolinko Date: Mon, 4 Jul 2011 13:59:53 +0000 Subject: [PATCH] Add @Override annotation git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1142670 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/catalina/tribes/membership/MemberImpl.java | 15 +++++++++++++++ .../apache/catalina/tribes/transport/ReceiverBase.java | 11 +++++++++++ 2 files changed, 26 insertions(+) diff --git a/java/org/apache/catalina/tribes/membership/MemberImpl.java b/java/org/apache/catalina/tribes/membership/MemberImpl.java index 1829144aa..c1e466190 100644 --- a/java/org/apache/catalina/tribes/membership/MemberImpl.java +++ b/java/org/apache/catalina/tribes/membership/MemberImpl.java @@ -142,12 +142,15 @@ public class MemberImpl implements Member, java.io.Externalizable { setPayload(payload); } + @Override public boolean isReady() { return SenderState.getSenderState(this).isReady(); } + @Override public boolean isSuspect() { return SenderState.getSenderState(this).isSuspect(); } + @Override public boolean isFailing() { return SenderState.getSenderState(this).isFailing(); } @@ -423,6 +426,7 @@ public class MemberImpl implements Member, java.io.Externalizable { * Return the name of this object * @return a unique name to the cluster */ + @Override public String getName() { return "tcp://"+getHostname()+":"+getPort(); } @@ -431,6 +435,7 @@ public class MemberImpl implements Member, java.io.Externalizable { * Return the listen port of this member * @return - tcp listen port */ + @Override public int getPort() { return this.port; } @@ -439,6 +444,7 @@ public class MemberImpl implements Member, java.io.Externalizable { * Return the TCP listen host for this member * @return IP address or host name */ + @Override public byte[] getHost() { return host; } @@ -464,6 +470,7 @@ public class MemberImpl implements Member, java.io.Externalizable { * broadcasting its membership to the cluster. * @return nr of milliseconds since this member started. */ + @Override public long getMemberAliveTime() { return memberAliveTime; } @@ -472,26 +479,32 @@ public class MemberImpl implements Member, java.io.Externalizable { return serviceStartTime; } + @Override public byte[] getUniqueId() { return uniqueId; } + @Override public byte[] getPayload() { return payload; } + @Override public byte[] getCommand() { return command; } + @Override public byte[] getDomain() { return domain; } + @Override public int getSecurePort() { return securePort; } + @Override public int getUdpPort() { return udpPort; } @@ -619,6 +632,7 @@ public class MemberImpl implements Member, java.io.Externalizable { this.dataPkg = null; } + @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { int length = in.readInt(); byte[] message = new byte[length]; @@ -627,6 +641,7 @@ public class MemberImpl implements Member, java.io.Externalizable { } + @Override public void writeExternal(ObjectOutput out) throws IOException { byte[] data = this.getData(); out.writeInt(data.length); diff --git a/java/org/apache/catalina/tribes/transport/ReceiverBase.java b/java/org/apache/catalina/tribes/transport/ReceiverBase.java index 8f9451931..1dbc38229 100644 --- a/java/org/apache/catalina/tribes/transport/ReceiverBase.java +++ b/java/org/apache/catalina/tribes/transport/ReceiverBase.java @@ -89,6 +89,7 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, R public ReceiverBase() { } + @Override public void start() throws IOException { if ( executor == null ) { //executor = new ThreadPoolExecutor(minThreads,maxThreads,60,TimeUnit.SECONDS,new LinkedBlockingQueue()); @@ -97,6 +98,7 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, R } } + @Override public void stop() { if ( executor != null ) executor.shutdownNow();//ignore left overs executor = null; @@ -108,6 +110,7 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, R * @return MessageListener * TODO Implement this org.apache.catalina.tribes.ChannelReceiver method */ + @Override public MessageListener getMessageListener() { return listener; } @@ -117,6 +120,7 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, R * @return The port * TODO Implement this org.apache.catalina.tribes.ChannelReceiver method */ + @Override public int getPort() { return port; } @@ -144,6 +148,7 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, R * @param listener MessageListener * TODO Implement this org.apache.catalina.tribes.ChannelReceiver method */ + @Override public void setMessageListener(MessageListener listener) { this.listener = listener; } @@ -274,6 +279,7 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, R } + @Override public void messageDataReceived(ChannelMessage data) { if ( this.listener != null ) { if ( listener.accept(data) ) listener.messageReceived(data); @@ -320,6 +326,7 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, R return this.host; } + @Override public String getHost() { return getAddress(); } @@ -406,6 +413,7 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, R return useBufferPool; } + @Override public int getSecurePort() { return securePort; } @@ -529,10 +537,12 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, R this.executor = executor; } + @Override public void heartbeat() { //empty operation } + @Override public int getUdpPort() { return udpPort; } @@ -569,6 +579,7 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, R this.namePrefix = namePrefix; } + @Override public Thread newThread(Runnable r) { Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement()); t.setDaemon(daemon); -- 2.11.0