zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~zorba-coders/zorba/bug-1169191 into lp:zorba.

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

Requested reviews:
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1169191/+merge/159035
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1169191/+merge/159035
Your team Zorba Coders is subscribed to branch lp:zorba.

=== 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:37: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());