summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2014-12-09 15:00:19 +0000
committerKeith Wall <kwall@apache.org>2014-12-09 15:00:19 +0000
commit8aaf925dc76e09c58c41febb3d63a4610f8c21e2 (patch)
treefdf8fb1229bff722dabb49b9288ff50ababcf7d2
parent5a53d804f8b548cd4f4829ca8322f76e7f5d8767 (diff)
downloadqpid-python-8aaf925dc76e09c58c41febb3d63a4610f8c21e2.tar.gz
Omit the BrokerLoggingTest that tests SSL. As SSL is currently disabled the IO threads it was spawning were being left behind
running on after the tests completed. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1644073 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java7
-rw-r--r--qpid/java/test-profiles/JavaExcludes2
2 files changed, 9 insertions, 0 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java
index 3bc5abf27b..f74f934ff3 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java
@@ -112,6 +112,9 @@ public class NonBlockingSenderReceiver implements Runnable, Sender<ByteBuffer>
@Override
public void run()
{
+
+ LOGGER.debug("I/O for thread " + _remoteSocketAddress + " started");
+
// never ending loop doing
// try to write all pending byte buffers, handle situation where zero bytes or part of a byte buffer is written
// read as much as you can
@@ -162,6 +165,10 @@ public class NonBlockingSenderReceiver implements Runnable, Sender<ByteBuffer>
{
LOGGER.info("Exception performing final output for thread '" + _remoteSocketAddress + "': " + e);
}
+ finally
+ {
+ LOGGER.info("Shutting down IO thread for " + _remoteSocketAddress);
+ }
}
diff --git a/qpid/java/test-profiles/JavaExcludes b/qpid/java/test-profiles/JavaExcludes
index 603d6293ce..610981a24c 100644
--- a/qpid/java/test-profiles/JavaExcludes
+++ b/qpid/java/test-profiles/JavaExcludes
@@ -35,3 +35,5 @@ org.apache.qpid.test.client.message.SelectorTest#testRuntimeSelectorError
// QPID-6262: Temporary exclusion whilst NIO refactoring is in flight
org.apache.qpid.client.ssl.SSLTest#*
org.apache.qpid.server.transport.TCPandSSLTransportTest#*
+org.apache.qpid.server.logging.BrokerLoggingTest#testBrokerStartupListeningTCPSSL
+org.apache.qpid.server.logging.BrokerLoggingTest#testBrokerShutdownListeningTCPSSL