Author: orudyy
Date: Thu Nov 26 14:27:27 2015
New Revision: 1716682
URL: http://svn.apache.org/viewvc?rev=1716682&view=rev
Log:
QPID-6869: Address remaining review comments from Lorenz Quack
------------------------------------------------------------------------
Merged from trunk with command:
svn merge -c r1716374 https://svn.apache.org/repos/asf/qpid/java/trunk
Modified:
qpid/java/branches/6.0.x/ (props changed)
qpid/java/branches/6.0.x/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TCPTunneler.java
qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/AbruptClientDisconnectTest.java
Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 14:27:27 2015
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374
/qpid/trunk/qpid:796646-796653
Modified:
qpid/java/branches/6.0.x/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TCPTunneler.java
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TCPTunneler.java?rev=1716682&r1=1716681&r2=1716682&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TCPTunneler.java
(original)
+++
qpid/java/branches/6.0.x/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TCPTunneler.java
Thu Nov 26 14:27:27 2015
@@ -48,12 +48,12 @@ public class TCPTunneler
private final TCPWorker _tcpWorker;
private final ExecutorService _executor;
- public TCPTunneler(final int localHost, final String remotetHost,
+ public TCPTunneler(final int localPort, final String remoteHost,
final int remotePort,
final int numberOfConcurrentClients)
{
_executor = Executors.newFixedThreadPool(numberOfConcurrentClients * 2
+ 1);
- _tcpWorker = new TCPWorker(localHost, remotetHost, remotePort,
_executor);
+ _tcpWorker = new TCPWorker(localPort, remoteHost, remotePort,
_executor);
}
public void start() throws IOException
@@ -99,7 +99,7 @@ public class TCPTunneler
void clientDisconnected(InetSocketAddress clientAddress);
}
- public static class TCPWorker implements Runnable
+ private static class TCPWorker implements Runnable
{
private final String _remoteHost;
private final int _remotePort;
@@ -366,7 +366,7 @@ public class TCPTunneler
}
- public static class SocketTunnel
+ private static class SocketTunnel
{
private final Socket _clientSocket;
private final Socket _serverSocket;
@@ -475,7 +475,7 @@ public class TCPTunneler
}
}
- public static class StreamForwarder implements Runnable
+ private static class StreamForwarder implements Runnable
{
private static final int BUFFER_SIZE = 4096;
Modified:
qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/AbruptClientDisconnectTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/AbruptClientDisconnectTest.java?rev=1716682&r1=1716681&r2=1716682&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/AbruptClientDisconnectTest.java
(original)
+++
qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/AbruptClientDisconnectTest.java
Thu Nov 26 14:27:27 2015
@@ -354,6 +354,7 @@ public class AbruptClientDisconnectTest
catch (InterruptedException e)
{
_thread.interrupt();
+ Thread.currentThread().interrupt();
}
}
}
@@ -451,6 +452,7 @@ public class AbruptClientDisconnectTest
catch (InterruptedException e)
{
_thread.interrupt();
+ Thread.currentThread().interrupt();
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
