Pulled in prestona's changes for exception handling and fixed jython shim accordingly. This closes #37.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/cd42324e Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/cd42324e Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/cd42324e Branch: refs/heads/master Commit: cd42324ed85c3914c9ed6f5c83d428a4d8e480b5 Parents: a4fe79e Author: Rafael Schloming <r...@alum.mit.edu> Authored: Thu Jun 18 07:33:31 2015 -0400 Committer: Rafael Schloming <r...@alum.mit.edu> Committed: Thu Jun 18 07:34:30 2015 -0400 ---------------------------------------------------------------------- proton-j/src/main/resources/chandlers.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/cd42324e/proton-j/src/main/resources/chandlers.py ---------------------------------------------------------------------- diff --git a/proton-j/src/main/resources/chandlers.py b/proton-j/src/main/resources/chandlers.py index aa5bd19..f1761ed 100644 --- a/proton-j/src/main/resources/chandlers.py +++ b/proton-j/src/main/resources/chandlers.py @@ -17,9 +17,10 @@ # under the License. # +import sys from cerror import Skipped from org.apache.qpid.proton.reactor import FlowController, Handshaker -from org.apache.qpid.proton.engine import BaseHandler +from org.apache.qpid.proton.engine import BaseHandler, HandlerException # from proton/handlers.h def pn_flowcontroller(window): @@ -40,4 +41,7 @@ class pn_pyhandler(BaseHandler): def onUnhandled(self, event): ev = pn_event(event) - self.pyobj.dispatch(ev, pn_event_type(ev)) + try: + self.pyobj.dispatch(ev, pn_event_type(ev)) + except: + self.pyobj.exception(*sys.exc_info()) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
