QPID-5250: Fixed the ordering of caught/throw Ruby exceptions.

The previous ordering let parent classes be caught before descendant
classes.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1535837 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 40 insertions, 40 deletions

diff --git a/cpp/bindings/qpid/ruby/ruby.i b/cpp/bindings/qpid/ruby/ruby.i
index 2a544072ad..34388a2b16 100644
--- a/cpp/bindings/qpid/ruby/ruby.i
+++ b/cpp/bindings/qpid/ruby/ruby.i
@@ -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) {