Author: gsim
Date: Fri Jun 27 22:14:14 2014
New Revision: 1606258
URL: http://svn.apache.org/r1606258
Log:
QPID-5858: prevent leakage of old exception types
Modified:
qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
qpid/trunk/qpid/cpp/src/tests/MessagingSessionTests.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp?rev=1606258&r1=1606257&r2=1606258&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp Fri Jun 27
22:14:14 2014
@@ -62,7 +62,21 @@ void SessionImpl::checkError()
{
ScopedLock l(lock);
qpid::client::SessionBase_0_10Access s(session);
- s.get()->assertOpen();
+ try {
+ s.get()->assertOpen();
+ } catch (const qpid::TransportFailure&) {
+ throw qpid::messaging::TransportFailure(std::string());
+ } catch (const qpid::framing::ResourceLimitExceededException& e) {
+ throw qpid::messaging::TargetCapacityExceeded(e.what());
+ } catch (const qpid::framing::UnauthorizedAccessException& e) {
+ throw qpid::messaging::UnauthorizedAccess(e.what());
+ } catch (const qpid::SessionException& e) {
+ throw qpid::messaging::SessionError(e.what());
+ } catch (const qpid::ConnectionException& e) {
+ throw qpid::messaging::ConnectionError(e.what());
+ } catch (const qpid::Exception& e) {
+ throw qpid::messaging::MessagingException(e.what());
+ }
}
bool SessionImpl::hasError()
Modified: qpid/trunk/qpid/cpp/src/tests/MessagingSessionTests.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/MessagingSessionTests.cpp?rev=1606258&r1=1606257&r2=1606258&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/MessagingSessionTests.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/MessagingSessionTests.cpp Fri Jun 27 22:14:14
2014
@@ -1432,6 +1432,25 @@ QPID_AUTO_TEST_CASE(testCloseAndMultiple
BOOST_CHECK(!fetcher.timedOut);
}
+QPID_AUTO_TEST_CASE(testSessionCheckError)
+{
+ MessagingFixture fix;
+ std::string queue();
+ Session session = fix.connection.createSession();
+ Sender sender = session.createSender("q; {create:always,
node:{x-declare:{auto-delete:True, arguments:{qpid.max_count:1}}}}");
+ ScopedSuppressLogging sl;
+ for (uint i = 0; i < 2; ++i) {
+ sender.send(Message((boost::format("A_%1%") % (i+1)).str()));
+ }
+ try {
+ while (true) session.checkError();
+ } catch (const qpid::types::Exception&) {
+ //this is ok
+ } catch (const qpid::Exception&) {
+ BOOST_FAIL("Wrong exception type thrown");
+ }
+}
+
QPID_AUTO_TEST_SUITE_END()
}} // namespace qpid::tests
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
