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

[Chris Hillery]

Only attempt to resolve a base URI against the entity-retrieval URI if said entity-retrieval URI itself absolute.

[Chris Hillery (ceejatec)]

review: Approve

[lp:~zorba-coders/zorba/bug-1169191]

11373. By Chris Hillery on 2013-04-15

One less FOTS failure.

[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-1169191-2013-04-16T06-49-41.896Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1169191-2013-04-16T06-49-41.896Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp	2013-04-02 21:43:27 +0000
+++ src/context/static_context.cpp	2013-04-15 22:44:26 +0000
@@ -1499,10 +1499,12 @@
     if (found)
     {
       URI base(entityUri);
-      URI resolvedURI(base, userBaseUri);
-      theBaseUriInfo->theBaseUri = resolvedURI.toString();
-      theBaseUriInfo->theHaveBaseUri = true;
-      return;
+      if (base.is_absolute()) {
+        URI resolvedURI(base, userBaseUri);
+        theBaseUriInfo->theBaseUri = resolvedURI.toString();
+        theBaseUriInfo->theHaveBaseUri = true;
+        return;
+      }
     }
 
     URI base(get_implementation_baseuri());
 
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-04-15 13:37:43 +0000
+++ test/fots/CMakeLists.txt	2013-04-15 22:44:26 +0000
@@ -488,7 +488,6 @@
 EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof12 0)
 EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof14 0)
 EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof15 0)
-EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof16 0)
 EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof17 0)
 EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof18 0)
 EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof19 0)