You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by mc...@apache.org on 2013/10/25 21:39:00 UTC
svn commit: r1535837 - /qpid/trunk/qpid/cpp/bindings/qpid/ruby/ruby.i
Author: mcpierce
Date: Fri Oct 25 19:39:00 2013
New Revision: 1535837
URL: http://svn.apache.org/r1535837
Log:
QPID-5250: Fixed the ordering of caught/throw Ruby exceptions.
The previous ordering let parent classes be caught before descendant
classes.
Modified:
qpid/trunk/qpid/cpp/bindings/qpid/ruby/ruby.i
Modified: qpid/trunk/qpid/cpp/bindings/qpid/ruby/ruby.i
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/ruby/ruby.i?rev=1535837&r1=1535836&r2=1535837&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/ruby/ruby.i (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/ruby/ruby.i Fri Oct 25 19:39:00 2013
@@ -32,84 +32,84 @@
try {
$action
}
- catch(qpid::messaging::InvalidOptionString& error) {
- static VALUE merror = rb_define_class("InvalidOptionString", eMessagingError);
- rb_raise(merror, error.what());
- }
- catch(qpid::messaging::KeyError& error) {
- static VALUE merror = rb_define_class("KeyError", eMessagingError);
+ catch(qpid::messaging::ConnectionError& error) {
+ static VALUE merror = rb_define_class("ConnectionError", eMessagingError);
rb_raise(merror, error.what());
}
- catch(qpid::messaging::LinkError& error) {
- static VALUE merror = rb_define_class("LinkError", eMessagingError);
+ catch(qpid::messaging::TransportFailure& error) {
+ static VALUE merror = rb_define_class("TransportFailure", eMessagingError);
rb_raise(merror, error.what());
}
- catch(qpid::messaging::AddressError& error) {
- static VALUE merror = rb_define_class("AddressError", eMessagingError);
+ catch(qpid::messaging::TransactionAborted& error) {
+ static VALUE merror = rb_define_class("TransactionAborted", eMessagingError);
rb_raise(merror, error.what());
}
- catch(qpid::messaging::ResolutionError& error) {
- static VALUE merror = rb_define_class("ResolutionError", eMessagingError);
+ catch(qpid::messaging::TransactionError& error) {
+ static VALUE merror = rb_define_class("TransactionError", eMessagingError);
rb_raise(merror, error.what());
}
- catch(qpid::messaging::AssertionFailed& error) {
- static VALUE merror = rb_define_class("AssertionFailed", eMessagingError);
+ catch(qpid::messaging::UnauthorizedAccess& error) {
+ static VALUE merror = rb_define_class("UnauthorizedAccess", eMessagingError);
rb_raise(merror, error.what());
}
- catch(qpid::messaging::NotFound& error) {
- static VALUE merror = rb_define_class("NotFound", eMessagingError);
+ catch(qpid::messaging::SessionError& error) {
+ static VALUE merror = rb_define_class("SessionError", eMessagingError);
rb_raise(merror, error.what());
}
- catch(qpid::messaging::MalformedAddress& error) {
- static VALUE merror = rb_define_class("MalformedAddress", eMessagingError);
+ catch(qpid::messaging::TargetCapacityExceeded& error) {
+ static VALUE merror = rb_define_class("TargetCapacityExceeded", eMessagingError);
rb_raise(merror, error.what());
}
- catch(qpid::messaging::ReceiverError& error) {
- static VALUE merror = rb_define_class("ReceiverError", eMessagingError);
+ catch(qpid::messaging::SendError& error) {
+ static VALUE merror = rb_define_class("SendError", eMessagingError);
rb_raise(merror, error.what());
}
- catch(qpid::messaging::FetchError& error) {
- static VALUE merror = rb_define_class("FetchError", eMessagingError);
+ catch(qpid::messaging::SenderError& error) {
+ static VALUE merror = rb_define_class("SenderError", eMessagingError);
rb_raise(merror, error.what());
}
catch(qpid::messaging::NoMessageAvailable& error) {
static VALUE merror = rb_define_class("NoMessageAvailable", eMessagingError);
rb_raise(merror, error.what());
}
- catch(qpid::messaging::SenderError& error) {
- static VALUE merror = rb_define_class("SenderError", eMessagingError);
+ catch(qpid::messaging::FetchError& error) {
+ static VALUE merror = rb_define_class("FetchError", eMessagingError);
rb_raise(merror, error.what());
}
- catch(qpid::messaging::SendError& error) {
- static VALUE merror = rb_define_class("SendError", eMessagingError);
+ catch(qpid::messaging::ReceiverError& error) {
+ static VALUE merror = rb_define_class("ReceiverError", eMessagingError);
rb_raise(merror, error.what());
}
- catch(qpid::messaging::TargetCapacityExceeded& error) {
- static VALUE merror = rb_define_class("TargetCapacityExceeded", eMessagingError);
+ catch(qpid::messaging::InvalidOptionString& error) {
+ static VALUE merror = rb_define_class("InvalidOptionString", eMessagingError);
rb_raise(merror, error.what());
}
- catch(qpid::messaging::SessionError& error) {
- static VALUE merror = rb_define_class("SessionError", eMessagingError);
+ catch(qpid::messaging::KeyError& error) {
+ static VALUE merror = rb_define_class("KeyError", eMessagingError);
rb_raise(merror, error.what());
}
- catch(qpid::messaging::TransactionError& error) {
- static VALUE merror = rb_define_class("TransactionError", eMessagingError);
+ catch(qpid::messaging::AssertionFailed& error) {
+ static VALUE merror = rb_define_class("AssertionFailed", eMessagingError);
rb_raise(merror, error.what());
}
- catch(qpid::messaging::TransactionAborted& error) {
- static VALUE merror = rb_define_class("TransactionAborted", eMessagingError);
+ catch(qpid::messaging::NotFound& error) {
+ static VALUE merror = rb_define_class("NotFound", eMessagingError);
rb_raise(merror, error.what());
}
- catch(qpid::messaging::UnauthorizedAccess& error) {
- static VALUE merror = rb_define_class("UnauthorizedAccess", eMessagingError);
+ catch(qpid::messaging::ResolutionError& error) {
+ static VALUE merror = rb_define_class("ResolutionError", eMessagingError);
rb_raise(merror, error.what());
}
- catch(qpid::messaging::ConnectionError& error) {
- static VALUE merror = rb_define_class("ConnectionError", eMessagingError);
+ catch(qpid::messaging::MalformedAddress& error) {
+ static VALUE merror = rb_define_class("MalformedAddress", eMessagingError);
rb_raise(merror, error.what());
}
- catch(qpid::messaging::TransportFailure& error) {
- static VALUE merror = rb_define_class("TransportFailure", eMessagingError);
+ catch(qpid::messaging::AddressError& error) {
+ static VALUE merror = rb_define_class("AddressError", eMessagingError);
+ rb_raise(merror, error.what());
+ }
+ catch(qpid::messaging::LinkError& error) {
+ static VALUE merror = rb_define_class("LinkError", eMessagingError);
rb_raise(merror, error.what());
}
catch(qpid::messaging::MessagingException& error) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org