Author: aconway
Date: Wed Mar 28 14:46:28 2007
New Revision: 523474
URL: http://svn.apache.org/viewvc?view=rev&rev=523474
Log:
Missed changes on previous commit.
Modified:
incubator/qpid/trunk/qpid/cpp/lib/common/sys/apr/APRAcceptor.cpp
incubator/qpid/trunk/qpid/cpp/tests/AcceptorTest.cpp
incubator/qpid/trunk/qpid/cpp/tests/Makefile.am
Modified: incubator/qpid/trunk/qpid/cpp/lib/common/sys/apr/APRAcceptor.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/lib/common/sys/apr/APRAcceptor.cpp?view=diff&rev=523474&r1=523473&r2=523474
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/common/sys/apr/APRAcceptor.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/lib/common/sys/apr/APRAcceptor.cpp Wed Mar 28
14:46:28 2007
@@ -82,9 +82,7 @@
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::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");
}
Modified: incubator/qpid/trunk/qpid/cpp/tests/AcceptorTest.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/tests/AcceptorTest.cpp?view=diff&rev=523474&r1=523473&r2=523474
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/tests/AcceptorTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/tests/AcceptorTest.cpp Wed Mar 28 14:46:28
2007
@@ -49,10 +49,9 @@
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 @@
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();
}
};
Modified: incubator/qpid/trunk/qpid/cpp/tests/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/tests/Makefile.am?view=diff&rev=523474&r1=523473&r2=523474
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/tests/Makefile.am Wed Mar 28 14:46:28 2007
@@ -12,7 +12,6 @@
# Unit tests
broker_tests = \
AccumulatedAckTest \
- AcceptorTest \
BrokerChannelTest \
ConfigurationTest \
ExchangeTest \
