Zorba

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

  1. bug-1169191
  2. Merge into trunk
Proposed by Chris Hillery
Status: Merged
Approved by: Markos Zaharioudakis
Approved revision: 11373
Merged at revision: 11372
Proposed branch: lp:~zorba-coders/zorba/bug-1169191
Merge into: lp:zorba
Diff against target: 32 lines (+6/-5)
2 files modified
src/context/static_context.cpp (+6/-4)
test/fots/CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1169191
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Chris Hillery Approve
Review via email: mp+159035@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
lp:~zorba-coders/zorba/bug-1169191 updated
11373. By Chris Hillery

One less FOTS failure.

Revision history for this message
Markos Zaharioudakis (markos-za) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1169191-2013-04-16T06-49-41.896Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/context/static_context.cpp'
2--- src/context/static_context.cpp 2013-04-02 21:43:27 +0000
3+++ src/context/static_context.cpp 2013-04-15 22:44:26 +0000
4@@ -1499,10 +1499,12 @@
5 if (found)
6 {
7 URI base(entityUri);
8- URI resolvedURI(base, userBaseUri);
9- theBaseUriInfo->theBaseUri = resolvedURI.toString();
10- theBaseUriInfo->theHaveBaseUri = true;
11- return;
12+ if (base.is_absolute()) {
13+ URI resolvedURI(base, userBaseUri);
14+ theBaseUriInfo->theBaseUri = resolvedURI.toString();
15+ theBaseUriInfo->theHaveBaseUri = true;
16+ return;
17+ }
18 }
19
20 URI base(get_implementation_baseuri());
21
22=== modified file 'test/fots/CMakeLists.txt'
23--- test/fots/CMakeLists.txt 2013-04-15 13:37:43 +0000
24+++ test/fots/CMakeLists.txt 2013-04-15 22:44:26 +0000
25@@ -488,7 +488,6 @@
26 EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof12 0)
27 EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof14 0)
28 EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof15 0)
29-EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof16 0)
30 EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof17 0)
31 EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof18 0)
32 EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof19 0)

Subscribers

People subscribed via source and target branches