Author: kwall
Date: Tue Dec 9 15:00:19 2014
New Revision: 1644073
URL: http://svn.apache.org/r1644073
Log:
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.
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/JavaExcludes
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java?rev=1644073&r1=1644072&r2=1644073&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java
Tue Dec 9 15:00:19 2014
@@ -112,6 +112,9 @@ public class NonBlockingSenderReceiver
@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
{
LOGGER.info("Exception performing final output for thread '" +
_remoteSocketAddress + "': " + e);
}
+ finally
+ {
+ LOGGER.info("Shutting down IO thread for " + _remoteSocketAddress);
+ }
}
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/JavaExcludes
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/JavaExcludes?rev=1644073&r1=1644072&r2=1644073&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/JavaExcludes
(original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/JavaExcludes
Tue Dec 9 15:00:19 2014
@@ -35,3 +35,5 @@ org.apache.qpid.test.client.message.Sele
// 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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
