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

[Till Westmann]

add location information to ZXQP0029_URI_ACCESS_DENIED

add location information to ZXQP0029_URI_ACCESS_DENIED

[Markos Zaharioudakis (markos-za)]

It is better (more robust) if the catch in translator.cpp catches ZorbaException instead of XQueryException.

[Chris Hillery (ceejatec)]

Please add the "correct exception" message back in test_userdefined_uri_resolvers, so that it is clear when the test passes. Also, as it is, if the test fails you will report the exception twice; that's probably not necessary.

Other than that and Markos' comment, looks fine.

[Till Westmann (tillw)]

I've changed the catch(...) in translator.cpp and I've put the "correct exception" message back into the test.
However, I don't see why the exception is reported twice, if the test fails.

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1009366-2012-06-14T20-56-11.007Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1009366-2012-06-14T20-56-11.007Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Approve, 1 Pending.

[Chris Hillery (ceejatec)]

I think I mis-read the diff last time when I mentioned the double output of exceptions (I didn't see it as two separate catch() clauses). Latest changes look fine.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1009366-2012-06-14T23-40-03.247Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1009366-2012-06-14T23-40-03.247Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2012-06-14 15:20:15 +0000
+++ src/compiler/translator/translator.cpp	2012-06-14 20:36:35 +0000
@@ -2967,13 +2967,24 @@
       // rather than using compURI directly, because we want the version
       // fragment to be passed to the mappers.
       zstring lErrorMessage;
-      std::auto_ptr<internal::Resource> lResource =
-      theSctx->resolve_uri(compModVer.versioned_uri(),
-                           internal::EntityData::MODULE,
-                           lErrorMessage);
-
-      internal::StreamResource* lStreamResource =
-      dynamic_cast<internal::StreamResource*> (lResource.get());
+      std::auto_ptr<internal::Resource> lResource;
+      internal::StreamResource* lStreamResource = NULL;
+
+      try
+      {
+        lResource =
+        theSctx->resolve_uri(compModVer.versioned_uri(),
+                             internal::EntityData::MODULE,
+                             lErrorMessage);
+
+        lStreamResource =
+        dynamic_cast<internal::StreamResource*> (lResource.get());
+      }
+      catch (ZorbaException& e)
+      {
+        set_source(e, loc);
+        throw;
+      }
 
       if (lStreamResource != NULL)
       {
 
=== modified file 'test/api/userdefined_uri_resolution.cpp'
--- test/api/userdefined_uri_resolution.cpp	2012-06-14 15:20:15 +0000
+++ test/api/userdefined_uri_resolution.cpp	2012-06-14 20:36:35 +0000
@@ -21,6 +21,7 @@
 #include <zorba/zorba.h>
 #include <zorba/store_manager.h>
 #include <zorba/zorba_exception.h>
+#include <zorba/xquery_exception.h>
 #include <zorba/uri_resolvers.h>
 #include <zorba/diagnostic_list.h>
 
@@ -297,12 +298,16 @@
         "'http://expath.org/ns/file'; "
         "1 + 1", lContext);
     std::cout << lQuery << std::endl;
-  } catch (ZorbaException& e) {
+  } catch (XQueryException& e) {
     std::cout << "Caught exception: " << e.what() << std::endl;
-    if (e.diagnostic() == zerr::ZXQP0029_URI_ACCESS_DENIED) {
+    if (e.diagnostic() == zerr::ZXQP0029_URI_ACCESS_DENIED
+        && e.has_source()
+        && e.source_line() == 1) {
       std::cout << "...the correct exception!" << std::endl;
       return true;
     }
+  } catch (ZorbaException& e) {
+    std::cout << "Caught unexpected exception: " << e.what() << std::endl;
   }
   return false;
 }