You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ve...@apache.org on 2008/10/11 11:59:26 UTC
svn commit: r703642 - in
/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon:
Acceptor.java Relay.java
Author: veithen
Date: Sat Oct 11 02:59:25 2008
New Revision: 703642
URL: http://svn.apache.org/viewvc?rev=703642&view=rev
Log:
Transport testkit: Reduce the noise generated by the TCP monitor when running test cases.
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon/Acceptor.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon/Relay.java
Modified: webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon/Acceptor.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon/Acceptor.java?rev=703642&r1=703641&r2=703642&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon/Acceptor.java (original)
+++ webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon/Acceptor.java Sat Oct 11 02:59:25 2008
@@ -51,8 +51,8 @@
}
try {
Socket targetSocket = new Socket(target.getAddress(), target.getPort());
- executorService.execute(new Relay("SENT", socket.getInputStream(), targetSocket.getOutputStream()));
- executorService.execute(new Relay("RECEIVED", targetSocket.getInputStream(), socket.getOutputStream()));
+ executorService.execute(new Relay("SENT", socket, targetSocket));
+ executorService.execute(new Relay("RECEIVED", targetSocket, socket));
} catch (IOException ex) {
log.error(ex);
}
Modified: webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon/Relay.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon/Relay.java?rev=703642&r1=703641&r2=703642&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon/Relay.java (original)
+++ webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon/Relay.java Sat Oct 11 02:59:25 2008
@@ -22,6 +22,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.Socket;
import org.apache.axis2.transport.base.datagram.Utils;
import org.apache.commons.io.IOUtils;
@@ -32,13 +33,15 @@
private static final Log log = LogFactory.getLog(Relay.class);
private final String tag;
+ private final Socket inSocket;
private final InputStream in;
private final OutputStream out;
- public Relay(String tag, InputStream in, OutputStream out) {
+ public Relay(String tag, Socket inSocket, Socket outSocket) throws IOException {
this.tag = tag;
- this.in = in;
- this.out = out;
+ this.inSocket = inSocket;
+ this.in = inSocket.getInputStream();
+ this.out = outSocket.getOutputStream();
}
public void run() {
@@ -54,7 +57,9 @@
out.flush();
}
} catch (IOException ex) {
- log.error(ex);
+ if (!inSocket.isClosed()) {
+ log.error(ex);
+ }
} finally {
IOUtils.closeQuietly(in);
IOUtils.closeQuietly(out);