Merge lp:~zorba-coders/zorba/bug-1103819 into lp:zorba

[Paul J. Lucas]

Reworked some catch clauses.

Reworked some catch clauses.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1103819-2013-02-09T08-51-07.388Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug-1103819 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug-1103819-2013-02-09T08-51-07.388Z is finished. The
  final status was:

  31 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1103819-2013-02-09T09-20-57.362Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug-1103819 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug-1103819-2013-02-09T09-20-57.362Z is finished. The
  final status was:

  6 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1103819-2013-04-30T18-29-01.523Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug-1103819 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug-1103819-2013-04-30T18-29-01.523Z is finished. The
  final status was:

  117 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1103819/+merge/146312

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1103819/+merge/146312

Stage "TestZorbaUbuntu" failed.
115 tests failed (8402 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/193/testReport/ to view the results.

[Chris Hillery (ceejatec)]

A great number of parsing and serializing test cases fail with these changes. Do we have any plans to fix them up? It's not clear to me if anyone is driving this issue anymore...

review: Needs Information

Unmerged revisions

11213. By Cezar Andrei <email address hidden> on 2013-04-30

Remove catch throws, leave exceptions bubble up.

11212. By Cezar Andrei <email address hidden> on 2013-04-25

One more catch ... fix.

11211. By Cezar Andrei <email address hidden> on 2013-04-25

Fix catch( ... ).

11210. By Paul J. Lucas on 2013-04-24

Merge from bug1103819-catchAll.

11209. By Paul J. Lucas on 2013-04-24

Merge from trunk.

11208. By Paul J. Lucas on 2013-02-14

Merge from trunk.

11207. By Paul J. Lucas on 2013-02-13

Merge from trunk.

11206. By Paul J. Lucas on 2013-02-05

Merge from trunk.

11205. By Paul J. Lucas on 2013-02-03

Merge from trunk.

11204. By Paul J. Lucas on 2013-01-30

Merge from trunk.

=== modified file 'src/api/xqueryimpl.cpp'
--- src/api/xqueryimpl.cpp	2013-04-10 10:13:31 +0000
+++ src/api/xqueryimpl.cpp	2013-04-30 17:01:29 +0000
@@ -80,6 +80,7 @@
 namespace zorba
 {
 
+#define QUERY_TRY try
 
 #define QUERY_CATCH                                                 \
   catch (ZorbaException const& e)                                   \
@@ -942,7 +943,7 @@
 {
   SYNC_CODE(AutoMutex lock(&theMutex);)
 
-  try
+  QUERY_TRY
   {
     checkNotClosed();
     checkCompiled();
@@ -965,22 +966,7 @@
 
     return true;
   }
-  catch (ZorbaException const& e)
-  {
-    ZorbaImpl::notifyError(theDiagnosticHandler, e);
-  }
-  catch (FlowCtlException const&)
-  {
-    ZorbaImpl::notifyError(theDiagnosticHandler, "User interrupt");
-  }
-  catch (std::exception const& e)
-  {
-    ZorbaImpl::notifyError(theDiagnosticHandler, e.what());
-  }
-  catch (...)
-  {
-    ZorbaImpl::notifyError(theDiagnosticHandler);
-  }
+  QUERY_CATCH
 
   return false;
 }
 
=== modified file 'src/capi/cdynamic_context.cpp'
--- src/capi/cdynamic_context.cpp	2013-02-07 17:24:36 +0000
+++ src/capi/cdynamic_context.cpp	2013-04-30 17:01:29 +0000
@@ -271,10 +271,7 @@
   CDynamicContext::free(XQC_DynamicContext* context)
   {
     try {
-      CDynamicContext* me = CDynamicContext::get(context);
-      delete me;
-    } catch (ZorbaException const&) { 
-      assert(false);
+      delete CDynamicContext::get(context);
     } catch (...) { 
       assert(false);
     }
 
=== modified file 'src/capi/cexpression.cpp'
--- src/capi/cexpression.cpp	2013-02-07 17:24:36 +0000
+++ src/capi/cexpression.cpp	2013-04-30 17:01:29 +0000
@@ -227,10 +227,7 @@
   CExpression::free(XQC_Expression* expr)
   {
     try {
-      CExpression* me = CExpression::get(expr);
-      delete me;
-    } catch (ZorbaException const&) {
-      assert(false);
+      delete CExpression::get(expr);
     } catch (...) {
       assert(false);
     }
 
=== modified file 'src/capi/cimplementation.cpp'
--- src/capi/cimplementation.cpp	2013-02-07 17:24:36 +0000
+++ src/capi/cimplementation.cpp	2013-04-30 17:01:29 +0000
@@ -507,10 +507,7 @@
   CImplementation::free(XQC_Implementation* impl)
   {
     try {
-      CImplementation* me = CImplementation::get(impl);
-      delete me;
-    } catch (ZorbaException const&) {
-      assert(false);
+      delete CImplementation::get(impl);
     } catch (...) {
       assert(false);
     }
 
=== modified file 'src/capi/csequence.cpp'
--- src/capi/csequence.cpp	2013-02-07 17:24:36 +0000
+++ src/capi/csequence.cpp	2013-04-30 17:01:29 +0000
@@ -492,10 +492,7 @@
 CSequence::free(XQC_Sequence* seq)
 {
   try {
-    CSequence* me = CSequence::get(seq);
-    delete me;
-  } catch (ZorbaException const&) {
-    assert(false);
+    delete CSequence::get(seq);
   } catch (...) {
     assert(false);
   }
 
=== modified file 'src/capi/cstatic_context.cpp'
--- src/capi/cstatic_context.cpp	2013-02-07 17:24:36 +0000
+++ src/capi/cstatic_context.cpp	2013-04-30 17:01:29 +0000
@@ -666,10 +666,7 @@
   CStaticContext::free(XQC_StaticContext* context)
   {
     try {
-      CStaticContext* me = CStaticContext::get(context);
-      delete me;
-    } catch (ZorbaException const&) { 
-      assert(false);
+      delete CStaticContext::get(context);
     } catch (...) { 
       assert(false);
     }
 
=== modified file 'src/context/default_url_resolvers.cpp'
--- src/context/default_url_resolvers.cpp	2013-02-07 17:24:36 +0000
+++ src/context/default_url_resolvers.cpp	2013-04-30 17:01:29 +0000
@@ -21,6 +21,7 @@
 #include "util/uri_util.h"
 #include "util/http_util.h"
 #include "util/fs_util.h"
+#include "util/string_util.h"
 #include "store/api/store.h"
 #include "store/api/item_factory.h"
 #include "store/api/collection.h"
@@ -93,6 +94,11 @@
         new StreamResource(&(lStream->getStream()), lStream->getStreamReleaser());
     lStream->setStreamReleaser(nullptr);
     return lResource;
+  } catch (std::exception const &e) {
+    std::string const msg(
+      BUILD_STRING( "Could not create stream resource: ", e.what() )
+    );
+    throw os_error::exception( "", aUrl.c_str(), msg.c_str() );
   } catch (...) {
     throw os_error::exception("", aUrl.c_str(), "Could not create stream resource");
   }
 
=== modified file 'src/runtime/debug/debug_iterator_impl.cpp'
--- src/runtime/debug/debug_iterator_impl.cpp	2013-02-07 17:24:36 +0000
+++ src/runtime/debug/debug_iterator_impl.cpp	2013-04-30 17:01:29 +0000
@@ -205,25 +205,18 @@
   if (lCommons->canBreak() && (lCommons->mustBreak(lCause) ||
       lCommons->hasToBreakAt(loc) || lCommons->hasToBreakAt(this)))
   {
-    try
-    {
-      lCause = lCause == 0 ? CAUSE_BREAKPOINT : lCause;
-      
-      // tell everybody that we are the iterator who suspended
-      //lCommons->setCurrentIterator(this);
-      lCommons->setCurrentStaticContext(getStaticContext());
-      lCommons->setCurrentDynamicContext(planState->theLocalDynCtx);
-      lCommons->setBreak(false);
-      lCommons->setPlanState(planState);
+    lCause = lCause == 0 ? CAUSE_BREAKPOINT : lCause;
+    
+    // tell everybody that we are the iterator who suspended
+    //lCommons->setCurrentIterator(this);
+    lCommons->setCurrentStaticContext(getStaticContext());
+    lCommons->setCurrentDynamicContext(planState->theLocalDynCtx);
+    lCommons->setBreak(false);
+    lCommons->setPlanState(planState);
 
-      // suspend
-      lCommons->getRuntime()->suspendRuntime(loc, lCause);
-      lCause = 0;
-    }
-    catch (...)
-    {
-      throw;
-    }
+    // suspend
+    lCommons->getRuntime()->suspendRuntime(loc, lCause);
+    lCause = 0;
   }
 }
 #endif // ZORBA_WITH_DEBUGGER
 
=== modified file 'src/runtime/indexing/doc_indexer.cpp'
--- src/runtime/indexing/doc_indexer.cpp	2013-02-07 17:24:36 +0000
+++ src/runtime/indexing/doc_indexer.cpp	2013-04-30 17:01:29 +0000
@@ -150,9 +150,7 @@
       }
       catch(...)
       {
-        if (key != NULL)
-          delete key;
-
+        delete key;
         throw;
       }
     }
 
=== modified file 'src/store/naive/loader_dtd.cpp'
--- src/store/naive/loader_dtd.cpp	2013-04-16 21:12:12 +0000
+++ src/store/naive/loader_dtd.cpp	2013-04-30 17:01:29 +0000
@@ -196,7 +196,9 @@
       if (theFragmentStream->ctxt == NULL)
       {
         theXQueryDiagnostics->add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( XMLParserInitFailed ) )));
-        throw 0; // the argument to throw is not used by the catch clause
+        abortload();
+        thePathStack.clear();
+        return NULL;
       }
 
       // Apply parser options
@@ -210,7 +212,9 @@
       if (input == NULL)
       {
         theXQueryDiagnostics->add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( XMLParserInitFailed ) )));
-        throw 0; // the argument to throw is not used by the catch clause
+        abortload();
+        thePathStack.clear();
+        return NULL;
       }
 
       // Initialize the parser input (only filename and the pointer to the current char)
@@ -253,7 +257,9 @@
               NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLNoOpeningTag ))) :
               NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLNoOpeningTag ), theDocUri))
             );
-        throw 0; // the argument to throw is not used by the catch clause
+        abortload();
+        thePathStack.clear();
+        return NULL;
       }
       
       // parse the DOCTYPE declaration, if any
@@ -281,7 +287,9 @@
               NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( ParseFragmentDoctypeNotAllowedHere ))) :
               NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( ParseFragmentDoctypeNotAllowedHere ), theDocUri))
             );
-            throw 0; // the argument to throw is not used by the catch clause
+            abortload();
+            thePathStack.clear();
+            return NULL;
           }
           else // theLoadProperties.getErrorOnDoctype() == true
           {
@@ -289,7 +297,9 @@
               NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( ParseFragmentDoctypeNotAllowed ))) :
               NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( ParseFragmentDoctypeNotAllowed ), theDocUri))
             );
-            throw 0; // the argument to throw is not used by the catch clause
+            abortload();
+            thePathStack.clear();
+            return NULL;
           }
         }
       }
@@ -332,7 +342,9 @@
       }
 
       if ( ! theXQueryDiagnostics->errors().empty())
-        throw 0; // the argument to throw is not used by the catch clause
+        abortload();
+        thePathStack.clear();
+        return NULL;
     }
 
     // this happens when there are tags that have not been closed
@@ -344,7 +356,9 @@
           NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLDocument_2o ))) :
           NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLDocument_2o ), theDocUri))
         );
-      throw 0;
+      abortload();
+      thePathStack.clear();
+      return NULL;
     }
     
     // this happens when the input is an empty string
@@ -355,11 +369,24 @@
 
     FragmentXmlLoader::endDocument(theFragmentStream->ctxt->userData); // this would not be called otherwise
   }
+  catch( std::exception const &e )
+  {
+    theXQueryDiagnostics->
+        add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR,
+                                      ERROR_PARAMS( e.what() )));
+
+    abortload();
+    thePathStack.clear();
+    return NULL;
+  }
   catch (...)
   {
+    theXQueryDiagnostics->
+      add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR));
+
     abortload();
     thePathStack.clear();
-    return NULL;
+    throw;
   }
 
   // The doc may be well formed, but it may have other kinds of errors, e.g., unresolved ns prefixes.
@@ -733,6 +760,14 @@
       )
     );
   }
+  catch (std::exception const &e)
+  {
+    theXQueryDiagnostics->add_error(
+      NEW_ZORBA_EXCEPTION(
+        zerr::ZSTR0020_LOADER_IO_ERROR, ERROR_PARAMS( e.what() )
+      )
+    );
+  }
   catch (...)
   {
     theXQueryDiagnostics->add_error(
@@ -850,8 +885,19 @@
       return NULL;
     }
   }
+  catch( std::exception const &e )
+  {
+    theXQueryDiagnostics->
+        add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR, ERROR_PARAMS( e.what() )));
+
+    abortload();
+    return NULL;
+  }
   catch(...)
   {
+    theXQueryDiagnostics->
+        add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR));
+
     abortload();
     thePathStack.clear();
     return NULL;
@@ -1071,6 +1117,14 @@
   {
     loader.theXQueryDiagnostics->add_error( e );
   }
+  catch( std::exception const &e )
+  {
+    loader.theXQueryDiagnostics->add_error(
+      NEW_ZORBA_EXCEPTION(
+        zerr::ZXQP0003_INTERNAL_ERROR, ERROR_PARAMS( e.what() )
+      )
+    );
+  }
   catch (...)
   {
     loader.theXQueryDiagnostics->add_error(
@@ -1153,6 +1207,14 @@
   {
     loader.theXQueryDiagnostics->add_error( e );
   }
+  catch( std::exception const &e )
+  {
+    loader.theXQueryDiagnostics->add_error(
+      NEW_ZORBA_EXCEPTION(
+        zerr::ZXQP0003_INTERNAL_ERROR, ERROR_PARAMS( e.what() )
+      )
+    );
+  }
   catch (...)
   {
     loader.theXQueryDiagnostics->add_error(
@@ -1447,6 +1509,14 @@
   {
     loader.theXQueryDiagnostics->add_error( e );
   }
+  catch( std::exception const &e )
+  {
+    loader.theXQueryDiagnostics->add_error(
+      NEW_ZORBA_EXCEPTION(
+        zerr::ZXQP0003_INTERNAL_ERROR, ERROR_PARAMS( e.what() )
+      )
+    );
+  }
   catch (...)
   {
     loader.theXQueryDiagnostics->
@@ -1579,6 +1649,14 @@
   {
     loader.theXQueryDiagnostics->add_error( e );
   }
+  catch( std::exception const &e )
+  {
+    loader.theXQueryDiagnostics->add_error(
+      NEW_ZORBA_EXCEPTION(
+        zerr::ZXQP0003_INTERNAL_ERROR, ERROR_PARAMS( e.what() )
+      )
+    );
+  }
   catch (...)
   {
     loader.theXQueryDiagnostics->add_error(
@@ -1630,6 +1708,14 @@
   {
     loader.theXQueryDiagnostics->add_error( e );
   }
+  catch( std::exception const &e )
+  {
+    loader.theXQueryDiagnostics->add_error(
+      NEW_ZORBA_EXCEPTION(
+        zerr::ZXQP0003_INTERNAL_ERROR, ERROR_PARAMS( e.what() )
+      )
+    );
+  }
   catch (...)
   {
     loader.theXQueryDiagnostics->add_error(
@@ -1683,6 +1769,14 @@
   {
     loader.theXQueryDiagnostics->add_error( e );
   }
+  catch( std::exception const &e )
+  {
+    loader.theXQueryDiagnostics->add_error(
+      NEW_ZORBA_EXCEPTION(
+        zerr::ZXQP0003_INTERNAL_ERROR, ERROR_PARAMS( e.what() )
+      )
+    );
+  }
   catch (...)
   {
     loader.theXQueryDiagnostics->add_error(
@@ -1733,6 +1827,14 @@
   {
     loader.theXQueryDiagnostics->add_error( e );
   }
+  catch( std::exception const &e )
+  {
+    loader.theXQueryDiagnostics->add_error(
+      NEW_ZORBA_EXCEPTION(
+        zerr::ZXQP0003_INTERNAL_ERROR, ERROR_PARAMS( e.what() )
+      )
+    );
+  }
   catch (...)
   {
     loader.theXQueryDiagnostics->add_error(
@@ -1776,6 +1878,14 @@
   {
     loader.theXQueryDiagnostics->add_error( e );
   }
+  catch( std::exception const &e )
+  {
+    loader.theXQueryDiagnostics->add_error(
+      NEW_ZORBA_EXCEPTION(
+        zerr::ZXQP0003_INTERNAL_ERROR, ERROR_PARAMS( e.what() )
+      )
+    );
+  }
   catch (...)
   {
     loader.theXQueryDiagnostics->add_error(
 
=== modified file 'src/store/naive/loader_fast.cpp'
--- src/store/naive/loader_fast.cpp	2013-04-08 22:59:58 +0000
+++ src/store/naive/loader_fast.cpp	2013-04-30 17:01:29 +0000
@@ -72,6 +72,25 @@
       return; \
   } while (0);
 
+#define LOADER_TRY try
+
+#define LOADER_CATCH                                            \
+  catch ( ZorbaException const &e ) {                           \
+    loader.theXQueryDiagnostics->add_error( e );                \
+  }                                                             \
+  catch ( std::exception const &e ) {                           \
+    loader.theXQueryDiagnostics->add_error(                     \
+      NEW_ZORBA_EXCEPTION(                                      \
+        zerr::ZXQP0003_INTERNAL_ERROR, ERROR_PARAMS( e.what() ) \
+      )                                                         \
+    );                                                          \
+  }                                                             \
+  catch ( ... ) {                                               \
+    loader.theXQueryDiagnostics->add_error(                     \
+      NEW_ZORBA_EXCEPTION( zerr::ZXQP0003_INTERNAL_ERROR )      \
+    );                                                          \
+  }
+
 
 /*******************************************************************************
 
@@ -334,7 +353,8 @@
 
     return stream.gcount();
   }
-  catch (std::iostream::failure e)
+  // catch-TODO: should ZorbaException be caught seperately here?
+  catch (std::exception const &e)
   {
     theXQueryDiagnostics->add_error(
       NEW_ZORBA_EXCEPTION(
@@ -445,7 +465,7 @@
     if (numChars < 0)
     {
       theXQueryDiagnostics->
-      add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR));
+        add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR));
 
       abortload();
       return NULL;
@@ -453,10 +473,22 @@
 
     xmlParseChunk(ctxt, theBuffer, 0, 1);
   }
+  catch( std::exception const &e )
+  {
+    theXQueryDiagnostics->
+        add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR,
+                                      ERROR_PARAMS( e.what() )));
+
+    abortload();
+    return NULL;
+  }
   catch(...)
   {
+    theXQueryDiagnostics->
+      add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR));
+
     abortload();
-    return NULL;
+    throw;
   }
 
   bool ok = ctxt->wellFormed != 0;
@@ -505,7 +537,7 @@
   FastXmlLoader& loader = *(static_cast<FastXmlLoader *>(ctx));
   ZORBA_LOADER_CHECK_ERROR(loader);
   
-  try
+  LOADER_TRY
   {
     DocumentNode* docNode = GET_STORE().getNodeFactory().createDocumentNode();
 
@@ -530,15 +562,7 @@
 
     LOADER_TRACE1("Start Doc Node = " << docNode);
   }
-  catch (ZorbaException const& e)
-  {
-    loader.theXQueryDiagnostics->add_error( e );
-  }
-  catch (...)
-  {
-    loader.theXQueryDiagnostics->
-    add_error(NEW_ZORBA_EXCEPTION(zerr::ZXQP0003_INTERNAL_ERROR));
-  }
+  LOADER_CATCH
 }
 
 
@@ -561,7 +585,7 @@
   DocumentNode* docNode;
   XmlNode* currChild;
   
-  try
+  LOADER_TRY
   {
     // This check is required because it is possible (in case of mal-formed doc)
     // that libXml calls endDocument() without having called startDocument().
@@ -615,16 +639,7 @@
 
     LOADER_TRACE2("End Doc Node = " << docNode);
   }
-  catch (ZorbaException const& e)
-  {
-    loader.theXQueryDiagnostics->add_error( e );
-  }
-  catch (...)
-  {
-    loader.theXQueryDiagnostics->add_error(
-      NEW_ZORBA_EXCEPTION( zerr::ZXQP0003_INTERNAL_ERROR )
-    );
-  }
+  LOADER_CATCH
 }
 
 
@@ -665,7 +680,7 @@
   zorba::Stack<PathStepInfo>& pathStack = loader.thePathStack;
   zstring baseUri;
 
-  try
+  LOADER_TRY
   {
     csize numAttributes = static_cast<csize>(numAttrs);
     csize numBindings = static_cast<csize>(numNamespaces);
@@ -856,15 +871,7 @@
     nodeStack.push(NULL);
     pathStack.push(PathStepInfo(elemNode, baseUri));
   }
-  catch (ZorbaException const& e)
-  {
-    loader.theXQueryDiagnostics->add_error( e );
-  }
-  catch (...)
-  {
-    loader.theXQueryDiagnostics->
-    add_error(NEW_ZORBA_EXCEPTION(zerr::ZXQP0003_INTERNAL_ERROR));
-  }
+  LOADER_CATCH
 }
 
 
@@ -897,7 +904,7 @@
   XmlNode* prevChild = NULL;
   XmlNode* currChild;
 
-  try
+  LOADER_TRY
   {
     // Find the position of the 1st child of this element node in the node stack
     firstChildPos = stackSize - 1;
@@ -984,16 +991,7 @@
     }
 #endif
   }
-  catch (ZorbaException const& e)
-  {
-    loader.theXQueryDiagnostics->add_error( e );
-  }
-  catch (...)
-  {
-    loader.theXQueryDiagnostics->add_error(
-      NEW_ZORBA_EXCEPTION( zerr::ZXQP0003_INTERNAL_ERROR )
-    );
-  }
+  LOADER_CATCH
 }
 
 
@@ -1009,7 +1007,7 @@
   FastXmlLoader& loader = *(static_cast<FastXmlLoader *>( ctx ));
   ZORBA_LOADER_CHECK_ERROR(loader);
 
-  try
+  LOADER_TRY
   {
     const char* charp = reinterpret_cast<const char*>(ch);
     zstring content(charp, len);
@@ -1035,16 +1033,7 @@
     LOADER_TRACE2(lSs.str());
 #endif
   }
-  catch (ZorbaException const& e)
-  {
-    loader.theXQueryDiagnostics->add_error( e );
-  }
-  catch (...)
-  {
-    loader.theXQueryDiagnostics->add_error(
-      NEW_ZORBA_EXCEPTION( zerr::ZXQP0003_INTERNAL_ERROR )
-    );
-  }
+  LOADER_CATCH
 }
 
 
@@ -1060,7 +1049,7 @@
   FastXmlLoader& loader = *(static_cast<FastXmlLoader *>( ctx ));
   ZORBA_LOADER_CHECK_ERROR(loader);
 
-  try
+  LOADER_TRY
   {
     // If a doc contains an element like <cdata><![CDATA[ <> ]]></cdata>,
     // libxml returns the string " <> ".
@@ -1088,16 +1077,7 @@
     LOADER_TRACE2(lSs.str());
 #endif
   }
-  catch (ZorbaException const& e)
-  {
-    loader.theXQueryDiagnostics->add_error( e );
-  }
-  catch (...)
-  {
-    loader.theXQueryDiagnostics->add_error(
-      NEW_ZORBA_EXCEPTION( zerr::ZXQP0003_INTERNAL_ERROR )
-    );
-  }
+  LOADER_CATCH
 }
 
 
@@ -1115,7 +1095,7 @@
   FastXmlLoader& loader = *(static_cast<FastXmlLoader *>( ctx ));
   ZORBA_LOADER_CHECK_ERROR(loader);
 
-  try
+  LOADER_TRY
   {
     // bugfix: handling PIs with no data (i.e. data being NULL)
     zstring content;
@@ -1138,16 +1118,7 @@
                   << targetp << std::endl << " ordpath = "
                   << piNode->getOrdPath().show() << std::endl);
   }
-  catch (ZorbaException const& e)
-  {
-    loader.theXQueryDiagnostics->add_error( e );
-  }
-  catch (...)
-  {
-    loader.theXQueryDiagnostics->add_error(
-      NEW_ZORBA_EXCEPTION( zerr::ZXQP0003_INTERNAL_ERROR )
-    );
-  }
+  LOADER_CATCH
 }
 
 
@@ -1162,7 +1133,7 @@
   FastXmlLoader& loader = *(static_cast<FastXmlLoader *>( ctx ));
   ZORBA_LOADER_CHECK_ERROR(loader);
 
-  try
+  LOADER_TRY
   {
     const char* charp = reinterpret_cast<const char*>(ch);
     zstring content;
@@ -1183,16 +1154,7 @@
                   << charp << std::endl << " ordpath = "
                   << commentNode->getOrdPath().show() << std::endl);
   }
-  catch (ZorbaException const& e)
-  {
-    loader.theXQueryDiagnostics->add_error( e );
-  }
-  catch (...)
-  {
-    loader.theXQueryDiagnostics->add_error(
-      NEW_ZORBA_EXCEPTION( zerr::ZXQP0003_INTERNAL_ERROR )
-    );
-  }
+  LOADER_CATCH
 }
 
 
 
=== modified file 'src/store/naive/node_items.cpp'
--- src/store/naive/node_items.cpp	2013-04-17 12:37:36 +0000
+++ src/store/naive/node_items.cpp	2013-04-30 17:01:29 +0000
@@ -763,26 +763,19 @@
   if (theParent == NULL)
     return false;
 
-  try
+  if (getNodeKind() == store::StoreConsts::attributeNode)
   {
-    if (getNodeKind() == store::StoreConsts::attributeNode)
-    {
-      csize numAttrs = theParent->numAttrs();
-      pos = theParent->removeAttr(this);
-      ZORBA_FATAL(pos <= numAttrs, "");
-      return (pos < numAttrs);
-    }
-    else
-    {
-      csize numChildren = theParent->numChildren();
-      pos = theParent->removeChild(this);
-      ZORBA_FATAL(pos <= numChildren, "");
-      return (pos < numChildren);
-    }
+    csize numAttrs = theParent->numAttrs();
+    pos = theParent->removeAttr(this);
+    ZORBA_FATAL(pos <= numAttrs, "");
+    return (pos < numAttrs);
   }
-  catch(...)
+  else
   {
-    ZORBA_FATAL(false, "Unexpected exception");
+    csize numChildren = theParent->numChildren();
+    pos = theParent->removeChild(this);
+    ZORBA_FATAL(pos <= numChildren, "");
+    return (pos < numChildren);
   }
 }
 
@@ -857,17 +850,10 @@
 ********************************************************************************/
 void XmlNode::destroy(bool removeType)
 {
-  try
-  {
-    csize pos;
-    disconnect(pos);
+  csize pos;
+  disconnect(pos);
 
-    destroyInternal(removeType);
-  }
-  catch (...)
-  {
-    ZORBA_FATAL(false, "Unexpected exception");
-  }
+  destroyInternal(removeType);
 }
 
 
 
=== modified file 'src/store/naive/node_updates.cpp'
--- src/store/naive/node_updates.cpp	2013-02-07 17:24:36 +0000
+++ src/store/naive/node_updates.cpp	2013-04-30 17:01:29 +0000
@@ -328,200 +328,193 @@
 ********************************************************************************/
 void XmlNode::detach()
 {
-  try
-  {
-    ZORBA_ASSERT(theParent != NULL);
-
-    ulong refcount = 0;
-
-    XmlTree* oldTree = getTree();
-    XmlTree* newTree = GET_STORE().getNodeFactory().createXmlTree();
-    newTree->setRoot(this);
-
-    if (oldTree->getRoot() == this)
-      oldTree->setRoot(NULL);
-
-    store::StoreConsts::NodeKind nodeKind = getNodeKind();
-
-    // ???? What we do here is not really thread-safe. For example, consider the
-    // following scenario: Let T1 be "this" thread and T2 be another thread that
-    // has an rchandle, rc2, on N. Right after T1 acquires the rclock on the old
-    // tree, T2 tries to make a copy of rc2; as a result, T2 will block on the
-    // old tree rclock. When T1 releases the old rclock, the old tree may be
-    // destroyed already, so T2 will be trying to acquire a deallocated lock. 
-    // Even if the old tree is there, T2 will increment the ref counter of the
-    // new tree while holding the lock of the old tree. In fact, the setTree()
-    // method istself is not safe (if T2 tries to copy rc2 after T1 has returned
-    // from setTree(), then things are ok).
-    SYNC_CODE(oldTree->getRCLock()->acquire());
-    SYNC_CODE(newTree->getRCLock()->acquire());
-
-    refcount += theRefCount;
-
-    switch (nodeKind)
-    {
-    case store::StoreConsts::attributeNode:
-    {
-      setTree(newTree);
-      theParent->removeAttr(this);
-      theParent = NULL;
-      break;
-    }
-    case store::StoreConsts::piNode:
-    case store::StoreConsts::commentNode:
-    {
-      setTree(newTree);
-      theParent->removeChild(this);
-      theParent = NULL;
-      break;
-    }
-    case store::StoreConsts::textNode:
-    {
-      setTree(newTree);
-
-      reinterpret_cast<TextNode*>(this)->revertToTextContent();
-
-      theParent->removeChild(this);
-      theParent = NULL;
-      break;
-    }
-    case store::StoreConsts::elementNode:
-    {
-      ElementNode* rootNode = reinterpret_cast<ElementNode*>(this);
-
-      // If the baseUri property of N is inherited from its ancestors, make a
-      // local copy of it, before disconnecting N from its parent.
-      bool localBaseUri;
-      zstring baseUri;
-      getBaseURIInternal(baseUri, localBaseUri);
-      if (!localBaseUri && !baseUri.empty())
-      {
-        zstring dummyUri;
-        rootNode->addBaseUriProperty(baseUri, dummyUri);
-      }
-
-      // For each node in the nodes stack, we must save the nsCtx of its
-      // parent node in the parentNsCtxs stack, because the nsCtx of the
-      // parent may change during the while loop below.
-      std::stack<XmlNode*> nodes;
-      std::stack<NsBindingsContext*> parentNsCtxs;
-
-      nodes.push(this);
-      parentNsCtxs.push(rootNode->theParent->getNsContext());
-
-      while (!nodes.empty())
-      {
-        XmlNode* node = nodes.top();
-        nodes.pop();
-
-        if (node->getNodeKind() == store::StoreConsts::elementNode)
+  ZORBA_ASSERT(theParent != NULL);
+
+  ulong refcount = 0;
+
+  XmlTree* oldTree = getTree();
+  XmlTree* newTree = GET_STORE().getNodeFactory().createXmlTree();
+  newTree->setRoot(this);
+
+  if (oldTree->getRoot() == this)
+    oldTree->setRoot(NULL);
+
+  store::StoreConsts::NodeKind nodeKind = getNodeKind();
+
+  // ???? What we do here is not really thread-safe. For example, consider the
+  // following scenario: Let T1 be "this" thread and T2 be another thread that
+  // has an rchandle, rc2, on N. Right after T1 acquires the rclock on the old
+  // tree, T2 tries to make a copy of rc2; as a result, T2 will block on the
+  // old tree rclock. When T1 releases the old rclock, the old tree may be
+  // destroyed already, so T2 will be trying to acquire a deallocated lock.
+  // Even if the old tree is there, T2 will increment the ref counter of the
+  // new tree while holding the lock of the old tree. In fact, the setTree()
+  // method istself is not safe (if T2 tries to copy rc2 after T1 has returned
+  // from setTree(), then things are ok).
+  SYNC_CODE(oldTree->getRCLock()->acquire());
+  SYNC_CODE(newTree->getRCLock()->acquire());
+
+  refcount += theRefCount;
+
+  switch (nodeKind)
+  {
+  case store::StoreConsts::attributeNode:
+  {
+    setTree(newTree);
+    theParent->removeAttr(this);
+    theParent = NULL;
+    break;
+  }
+  case store::StoreConsts::piNode:
+  case store::StoreConsts::commentNode:
+  {
+    setTree(newTree);
+    theParent->removeChild(this);
+    theParent = NULL;
+    break;
+  }
+  case store::StoreConsts::textNode:
+  {
+    setTree(newTree);
+
+    reinterpret_cast<TextNode*>(this)->revertToTextContent();
+
+    theParent->removeChild(this);
+    theParent = NULL;
+    break;
+  }
+  case store::StoreConsts::elementNode:
+  {
+    ElementNode* rootNode = reinterpret_cast<ElementNode*>(this);
+
+    // If the baseUri property of N is inherited from its ancestors, make a
+    // local copy of it, before disconnecting N from its parent.
+    bool localBaseUri;
+    zstring baseUri;
+    getBaseURIInternal(baseUri, localBaseUri);
+    if (!localBaseUri && !baseUri.empty())
+    {
+      zstring dummyUri;
+      rootNode->addBaseUriProperty(baseUri, dummyUri);
+    }
+
+    // For each node in the nodes stack, we must save the nsCtx of its
+    // parent node in the parentNsCtxs stack, because the nsCtx of the
+    // parent may change during the while loop below.
+    std::stack<XmlNode*> nodes;
+    std::stack<NsBindingsContext*> parentNsCtxs;
+
+    nodes.push(this);
+    parentNsCtxs.push(rootNode->theParent->getNsContext());
+
+    while (!nodes.empty())
+    {
+      XmlNode* node = nodes.top();
+      nodes.pop();
+
+      if (node->getNodeKind() == store::StoreConsts::elementNode)
+      {
+        ElementNode* elemNode = reinterpret_cast<ElementNode*>(node);
+
+        node->setTree(newTree);
+
+        // Preserve the namespace bindings of the current node
+        NsBindingsContext* nsContext = elemNode->getNsContext();
+        NsBindingsContext* parentNsContext = parentNsCtxs.top();
+        parentNsCtxs.pop();
+
+        // If the current node is N, or a node in NT that does not inherit ns
+        // bindings directly from its parent (but may inherit from some other
+        // ancestor).
+        if (elemNode == rootNode ||
+            nsContext == NULL ||
+            (elemNode->haveLocalBindings() &&
+             nsContext->getParent() != parentNsContext) ||
+            nsContext != parentNsContext)
         {
-          ElementNode* elemNode = reinterpret_cast<ElementNode*>(node);
-
-          node->setTree(newTree);
-
-          // Preserve the namespace bindings of the current node
-          NsBindingsContext* nsContext = elemNode->getNsContext();
-          NsBindingsContext* parentNsContext = parentNsCtxs.top();
-          parentNsCtxs.pop();
-
-          // If the current node is N, or a node in NT that does not inherit ns
-          // bindings directly from its parent (but may inherit from some other
-          // ancestor).
-          if (elemNode == rootNode ||
-              nsContext == NULL ||
-              (elemNode->haveLocalBindings() &&
-               nsContext->getParent() != parentNsContext) ||
-              nsContext != parentNsContext)
+          if (nsContext != NULL)
           {
-            if (nsContext != NULL)
+            std::auto_ptr<NsBindingsContext> ctx(new NsBindingsContext());
+            elemNode->getNamespaceBindings(ctx->getBindings());
+
+            if (!ctx->empty())
             {
-              std::auto_ptr<NsBindingsContext> ctx(new NsBindingsContext());
-              elemNode->getNamespaceBindings(ctx->getBindings());
-            
-              if (!ctx->empty())
-              {
-                elemNode->theNsContext = ctx.release();
-                elemNode->theFlags |= HaveLocalBindings;
-              }
+              elemNode->theNsContext = ctx.release();
+              elemNode->theFlags |= HaveLocalBindings;
             }
           }
-
-          // Else the current node is not N and it inherits ns bindings directly
-          // from its parent.
-          else
-          {
-            elemNode->setNsContext(elemNode->theParent->getNsContext());
-          }
-
-          // Detach the attributes of the current node
-          InternalNode::iterator ite = elemNode->attrsBegin();
-          InternalNode::iterator end = elemNode->attrsEnd();
-          
-          for (; ite != end; ++ite)
-          {
-            AttributeNode* attrNode = static_cast<AttributeNode*>(*ite);
-            refcount += attrNode->theRefCount;
-            attrNode->setTree(newTree);
-          }
-
-          // Detach the children of the current node
-          ite = elemNode->childrenBegin();
-          end = elemNode->childrenEnd();
-
-          for (; ite != end; ++ite)
-          {
-            XmlNode* child = (*ite);
-            refcount += child->theRefCount;
-
-            nodes.push(child);
-
-            if (child->getNodeKind() == store::StoreConsts::elementNode)
-              parentNsCtxs.push(nsContext);
-          }
         }
+
+        // Else the current node is not N and it inherits ns bindings directly
+        // from its parent.
         else
         {
-          node->setTree(newTree);
-        }
-      } // done traversing tree
-
-      theParent->removeChild(this);
-      theParent = NULL;
-
-      break;
-    }
-    default:
-    {
-      ZORBA_ASSERT(false);
-    }
-    }
-
-    newTree->getRefCount() += refcount;
-    if (newTree->getRefCount() == 0)
-    {
-      SYNC_CODE(newTree->getRCLock()->release());
-      newTree->free();
-    }
-    else
-    {
-      SYNC_CODE(newTree->getRCLock()->release());
-    }
-
-    oldTree->getRefCount() -= refcount;
-    if (oldTree->getRefCount() == 0)
-    {
-      SYNC_CODE(oldTree->getRCLock()->release());
-      oldTree->free();
-    }
-    else
-    {
-      SYNC_CODE(oldTree->getRCLock()->release());
-    }
-  }
-  catch(...)
-  {
-    ZORBA_FATAL(0, "Unexpected exception");
+          elemNode->setNsContext(elemNode->theParent->getNsContext());
+        }
+
+        // Detach the attributes of the current node
+        InternalNode::iterator ite = elemNode->attrsBegin();
+        InternalNode::iterator end = elemNode->attrsEnd();
+
+        for (; ite != end; ++ite)
+        {
+          AttributeNode* attrNode = static_cast<AttributeNode*>(*ite);
+          refcount += attrNode->theRefCount;
+          attrNode->setTree(newTree);
+        }
+
+        // Detach the children of the current node
+        ite = elemNode->childrenBegin();
+        end = elemNode->childrenEnd();
+
+        for (; ite != end; ++ite)
+        {
+          XmlNode* child = (*ite);
+          refcount += child->theRefCount;
+
+          nodes.push(child);
+
+          if (child->getNodeKind() == store::StoreConsts::elementNode)
+            parentNsCtxs.push(nsContext);
+        }
+      }
+      else
+      {
+        node->setTree(newTree);
+      }
+    } // done traversing tree
+
+    theParent->removeChild(this);
+    theParent = NULL;
+
+    break;
+  }
+  default:
+  {
+    ZORBA_ASSERT(false);
+  }
+  }
+
+  newTree->getRefCount() += refcount;
+  if (newTree->getRefCount() == 0)
+  {
+    SYNC_CODE(newTree->getRCLock()->release());
+    newTree->free();
+  }
+  else
+  {
+    SYNC_CODE(newTree->getRCLock()->release());
+  }
+
+  oldTree->getRefCount() -= refcount;
+  if (oldTree->getRefCount() == 0)
+  {
+    SYNC_CODE(oldTree->getRCLock()->release());
+    oldTree->free();
+  }
+  else
+  {
+    SYNC_CODE(oldTree->getRCLock()->release());
   }
 }
 
 
=== modified file 'src/store/naive/pul_primitives.cpp'
--- src/store/naive/pul_primitives.cpp	2013-02-26 04:12:43 +0000
+++ src/store/naive/pul_primitives.cpp	2013-04-30 17:01:29 +0000
@@ -744,9 +744,13 @@
   {
     theRevalidationPul->applyUpdates(false);
   }
+  catch (std::exception const &e)
+  {
+    ZORBA_FATAL(false, "Error during the in-place validation: " << e.what());
+  }
   catch (...)
   {
-    ZORBA_FATAL(0, "Error during the in-place validation");
+    ZORBA_FATAL(false, "Error during the in-place validation");
   }
 
   theIsApplied = true;
 
=== modified file 'src/store/naive/store.cpp'
--- src/store/naive/store.cpp	2013-03-20 18:39:54 +0000
+++ src/store/naive/store.cpp	2013-04-30 17:01:29 +0000
@@ -575,9 +575,7 @@
   }
   catch(...)
   {
-    if (key != NULL)
-      delete key;
-
+    delete key;
     sourceIter->close();
     throw;
   }
@@ -1051,6 +1049,7 @@
   catch(...)
   {
     delete stream;
+    // catch-TODO: "throw;" here?
   }
   return docitem;
 }
 
=== modified file 'src/types/schema/schema.cpp'
--- src/types/schema/schema.cpp	2013-04-16 21:12:12 +0000
+++ src/types/schema/schema.cpp	2013-04-30 17:01:29 +0000
@@ -1785,18 +1785,6 @@
                  targetType->toSchemaString(),
                  msg));
   }
-  catch(const OutOfMemoryException&)
-  {
-    throw;
-  }
-  catch (const ZorbaException&) 
-  {
-    throw;
-  }
-  catch (...)
-  {
-    throw;
-  }
 #endif //ZORBA_NO_XMLSCHEMA
 
   // find the non user defined base type
@@ -2093,15 +2081,9 @@
        BinMemOutputStream binmemoutputstream;
        zstring binstr;
 
-       try
-       {
-         theGrammarPool->serializeGrammars(&binmemoutputstream);
-         binstr.assign((char*)binmemoutputstream.getRawBuffer(),
-                        static_cast<zstring::size_type>(binmemoutputstream.getSize()) );
-       }
-       catch (...)
-       {
-       }
+       theGrammarPool->serializeGrammars(&binmemoutputstream);
+       binstr.assign((char*)binmemoutputstream.getRawBuffer(),
+                      static_cast<zstring::size_type>(binmemoutputstream.getSize()) );
 
        ar & binstr;
      }