Author: markt
Date: Thu Nov 11 12:40:15 2010
New Revision: 1033915
URL: http://svn.apache.org/viewvc?rev=1033915&view=rev
Log:
Clean-up
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java?rev=1033915&r1=1033914&r2=1033915&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
Thu Nov 11 12:40:15 2010
@@ -39,6 +39,7 @@ public class BioReceiver extends Receive
protected ServerSocket serverSocket;
public BioReceiver() {
+ // NO-OP
}
/**
@@ -69,6 +70,7 @@ public class BioReceiver extends Receive
}
}
+ @Override
public AbstractRxTask createRxTask() {
return getReplicationThread();
}
@@ -89,7 +91,7 @@ public class BioReceiver extends Receive
setListen(false);
try {
this.serverSocket.close();
- }catch ( Exception x ) {}
+ } catch (Exception x) {/* Ignore */}
super.stop();
}
@@ -103,6 +105,7 @@ public class BioReceiver extends Receive
}
+ @Override
public void run() {
try {
listen();
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java?rev=1033915&r1=1033914&r2=1033915&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
Thu Nov 11 12:40:15 2010
@@ -58,6 +58,7 @@ public class BioReplicationTask extends
}
// loop forever waiting for work to do
+ @Override
public synchronized void run()
{
if ( socket == null ) return;
@@ -66,8 +67,8 @@ public class BioReplicationTask extends
} catch ( Exception x ) {
log.error("Unable to service bio socket");
}finally {
- try {socket.close();}catch ( Exception ignore){}
- try {reader.close();}catch ( Exception ignore){}
+ try {socket.close();}catch ( Exception e){/* Ignore */}
+ try {reader.close();}catch ( Exception e){/* Ignore */}
reader = null;
socket = null;
}
@@ -158,8 +159,8 @@ public class BioReplicationTask extends
@Override
public void close() {
setDoRun(false);
- try {socket.close();}catch ( Exception ignore){}
- try {reader.close();}catch ( Exception ignore){}
+ try {socket.close();}catch ( Exception e){/* Ignore */}
+ try {reader.close();}catch ( Exception e){/* Ignore */}
reader = null;
socket = null;
super.close();
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java?rev=1033915&r1=1033914&r2=1033915&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
Thu Nov 11 12:40:15 2010
@@ -70,6 +70,7 @@ public class BioSender extends AbstractS
// -------------------------------------------------------------
Constructor
public BioSender() {
+ // NO-OP
}
@@ -203,6 +204,7 @@ public class BioSender extends AbstractS
try {
socket.close();
} catch (IOException x) {
+ // Ignore
} finally {
socket = null;
soOut = null;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java?rev=1033915&r1=1033914&r2=1033915&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
Thu Nov 11 12:40:15 2010
@@ -38,6 +38,7 @@ import org.apache.catalina.tribes.transp
*/
public class MultipointBioSender extends AbstractSender implements
MultiPointSender {
public MultipointBioSender() {
+ // NO-OP
}
protected long selectTimeout = 1000;
@@ -110,10 +111,14 @@ public class MultipointBioSender extends
if ( x != null ) throw x;
}
+ @Override
public void add(Member member) {
-
+ // NO-OP
+ // Members are defined by the array of members specified in the call to
+ // sendMessage()
}
+ @Override
public void remove(Member member) {
//disconnect senders
BioSender sender = bioSenders.remove(member);
@@ -123,13 +128,13 @@ public class MultipointBioSender extends
@Override
public synchronized void disconnect() {
- try {close(); }catch (Exception x){}
+ try {close(); }catch (Exception x){/* Ignore */}
setConnected(false);
}
@Override
public void finalize() {
- try {disconnect(); }catch ( Exception ignore){}
+ try {disconnect(); }catch ( Exception e){/* Ignore */}
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java?rev=1033915&r1=1033914&r2=1033915&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
Thu Nov 11 12:40:15 2010
@@ -38,8 +38,10 @@ public class PooledMultiSender extends P
public PooledMultiSender() {
+ // NO-OP
}
+ @Override
public void sendMessage(Member[] destination, ChannelMessage msg) throws
ChannelException {
MultiPointSender sender = null;
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
