Merge lp:~zorba-coders/zorba/bug-1158052-oracle-nosql-db into lp:zorba/oracle-nosql-db-module

Proposed by Paul J. Lucas on 2013-06-22
Status: Merged
Merged at revision: 30
Proposed branch: lp:~zorba-coders/zorba/bug-1158052-oracle-nosql-db
Merge into: lp:zorba/oracle-nosql-db-module
Diff against target: 21 lines (+2/-2)
1 file modified
src/nosqldb.xq.src/nosqldb.cpp (+2/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1158052-oracle-nosql-db
Reviewer Review Type Date Requested Status
Chris Hillery 2013-06-22 Approve on 2013-06-28
Paul J. Lucas Approve on 2013-06-22
Review via email: mp+170948@code.launchpad.net

Commit message

Corresponding changes for bug #1158052.

Description of the change

Corresponding changes for bug #1158052.

To post a comment you must log in.
Paul J. Lucas (paul-lucas) :
review: Approve
Chris Hillery (ceejatec) :
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/nosqldb.xq.src/nosqldb.cpp'
2--- src/nosqldb.xq.src/nosqldb.cpp 2013-06-12 13:59:19 +0000
3+++ src/nosqldb.xq.src/nosqldb.cpp 2013-06-22 13:15:32 +0000
4@@ -844,7 +844,7 @@
5
6 // assemble result { "value" : "the value" , "version" : 123 }
7 std::string ssString(buf, jbaSize);
8- Item val = NoSqlDBModule::getItemFactory()->createBase64Binary((const unsigned char*)ssString.c_str(), ssString.size());
9+ Item val( NoSqlDBModule::getItemFactory()->createBase64Binary(ssString.c_str(), ssString.size(), false) );
10 Item vers = NoSqlDBModule::getItemFactory()->createLong(versionLong);
11
12 std::vector<std::pair<Item, Item> > pairs;
13@@ -1427,7 +1427,7 @@
14 Item keyJsonObj = NoSqlDBModule::getItemFactory()->createJSONObject(keyPairs);
15
16 std::string ssString(buf, jbaSize);
17- Item val = NoSqlDBModule::getItemFactory()->createBase64Binary((const unsigned char*)ssString.c_str(), ssString.size());
18+ Item val( NoSqlDBModule::getItemFactory()->createBase64Binary(ssString.c_str(), ssString.size(), false) );
19 Item vers = NoSqlDBModule::getItemFactory()->createLong(version);
20
21 std::vector<std::pair<Item, Item> > pairs;

Subscribers

People subscribed via source and target branches

to all changes: