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

[Paul J. Lucas]

Corresponding changes for bug #1158052.

Corresponding changes for bug #1158052.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'src/nosqldb.xq.src/nosqldb.cpp'
--- src/nosqldb.xq.src/nosqldb.cpp	2013-06-12 13:59:19 +0000
+++ src/nosqldb.xq.src/nosqldb.cpp	2013-06-22 13:15:32 +0000
@@ -844,7 +844,7 @@
 
       // assemble result { "value" : "the value" , "version" : 123 }
       std::string ssString(buf, jbaSize);
-      Item val = NoSqlDBModule::getItemFactory()->createBase64Binary((const unsigned char*)ssString.c_str(), ssString.size());
+      Item val( NoSqlDBModule::getItemFactory()->createBase64Binary(ssString.c_str(), ssString.size(), false) );
       Item vers = NoSqlDBModule::getItemFactory()->createLong(versionLong);
 
       std::vector<std::pair<Item, Item> > pairs;
@@ -1427,7 +1427,7 @@
           Item keyJsonObj =  NoSqlDBModule::getItemFactory()->createJSONObject(keyPairs);
 
           std::string ssString(buf, jbaSize);
-          Item val = NoSqlDBModule::getItemFactory()->createBase64Binary((const unsigned char*)ssString.c_str(), ssString.size());
+          Item val( NoSqlDBModule::getItemFactory()->createBase64Binary(ssString.c_str(), ssString.size(), false) );
           Item vers = NoSqlDBModule::getItemFactory()->createLong(version);
 
           std::vector<std::pair<Item, Item> > pairs;