refs #380 fixed the test, updated comments

qorelanguage · Jan 26, 2016 · 18fd863 · 18fd863
1 parent 3bb0ed2
commit 18fd863
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/examples/test/qore/vars/statement.qtest b/examples/test/qore/vars/statement.qtest
@@ -202,9 +202,9 @@ class StatementTest inherits QUnit::Test {
         # bug 380: on_(exit|error) need to be run even if there is an active exception
         int i = 0;
         try {
-            on_exit
+            on_error
                 ++i;
-            on_error {
+            on_exit {
                 ++i;
                 throw True;
             }

diff --git a/lib/StatementBlock.cpp b/lib/StatementBlock.cpp
@@ -232,7 +232,7 @@ int StatementBlock::execIntern(QoreValue& return_value, ExceptionSink* xsink) {
 	    if ((*i).second) {
 	       nrc = (*i).second->execImpl(return_value, &obe_xsink);
 	       // bug 380: make sure and merge every exception after every conditional execution to ensure
-	       // that all on_(exit|success) statements are executed
+	       // that all on_(exit|error) statements are executed even if exceptions are thrown
 	       if (obe_xsink) {
 		  xsink->assimilate(obe_xsink);
 		  if (!error)