diff options
| author | Alan Conway <aconway@apache.org> | 2007-03-28 21:46:28 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-03-28 21:46:28 +0000 |
| commit | 2519f80edbeaa338bbe8d68b8554bd43fd4fa190 (patch) | |
| tree | 7e91146ea8d77e1c07939515e1270829d16d7bbd /cpp | |
| parent | 2c23ceed57ebc9a1e307e1e6ab25c1031d6256eb (diff) | |
| download | qpid-python-2519f80edbeaa338bbe8d68b8554bd43fd4fa190.tar.gz | |
Missed changes on previous commit.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@523474 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/lib/common/sys/apr/APRAcceptor.cpp | 4 | ||||
| -rw-r--r-- | cpp/tests/AcceptorTest.cpp | 5 | ||||
| -rw-r--r-- | cpp/tests/Makefile.am | 1 |
3 files changed, 1 insertions, 9 deletions
diff --git a/cpp/lib/common/sys/apr/APRAcceptor.cpp b/cpp/lib/common/sys/apr/APRAcceptor.cpp index a346b9e8dc..604fb9f5ca 100644 --- a/cpp/lib/common/sys/apr/APRAcceptor.cpp +++ b/cpp/lib/common/sys/apr/APRAcceptor.cpp @@ -82,9 +82,7 @@ void APRAcceptor::run(ConnectionInputHandlerFactory* factory) { std::cout << "Listening on port " << getPort() << "..." << std::endl; while(running) { apr_socket_t* client; - printf("== accept pre\n"); // FIXME aconway 2007-03-28: apr_status_t status = apr_socket_accept(&client, socket, APRPool::get()); - printf("== accept post %d %d\n", status, running); // FIXME aconway 2007-03-28: if(status == APR_SUCCESS){ //make this socket non-blocking: CHECK_APR_SUCCESS(apr_socket_timeout_set(client, 0)); @@ -115,9 +113,7 @@ void APRAcceptor::shutdown() { void APRAcceptor::shutdownImpl() { running = false; processor.stop(); - printf("== shutdownImpl pre\n"); // FIXME aconway 2007-03-28: CHECK_APR_SUCCESS(apr_socket_close(socket)); - printf("== shutdownImpl post\n"); } diff --git a/cpp/tests/AcceptorTest.cpp b/cpp/tests/AcceptorTest.cpp index 947ae2d11a..0b4b2c2578 100644 --- a/cpp/tests/AcceptorTest.cpp +++ b/cpp/tests/AcceptorTest.cpp @@ -49,10 +49,9 @@ class AcceptorTest : public CppUnit::TestCase, private Runnable Acceptor::shared_ptr acceptor; public: - using TestCase::run; // Avoid hiding TestCase::run. void run() { - acceptor->run(&factory); + acceptor->run(factory); } void setUp() { @@ -85,9 +84,7 @@ class AcceptorTest : public CppUnit::TestCase, private Runnable CPPUNIT_ASSERT_EQUAL(int(2), int(init.getMinor())); acceptor->shutdown(); - printf("== join\n"); // FIXME aconway 2007-03-28: runThread.join(); - printf("== joined\n"); // FIXME aconway 2007-03-28: factory.handler->waitForClosed(); } }; diff --git a/cpp/tests/Makefile.am b/cpp/tests/Makefile.am index e06901ed96..6ae3598a98 100644 --- a/cpp/tests/Makefile.am +++ b/cpp/tests/Makefile.am @@ -12,7 +12,6 @@ INCLUDES = \ # Unit tests broker_tests = \ AccumulatedAckTest \ - AcceptorTest \ BrokerChannelTest \ ConfigurationTest \ ExchangeTest \ |