Merge lp:~zorba-coders/zorba/bug-1158052-jdbc into lp:zorba/jdbc-module

Proposed by Paul J. Lucas on 2013-06-22
Status: Merged
Merged at revision: 56
Proposed branch: lp:~zorba-coders/zorba/bug-1158052-jdbc
Merge into: lp:zorba/jdbc-module
Diff against target: 14 lines (+2/-2)
1 file modified
src/jdbc.xq.src/jsonitemsequence.cpp (+2/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1158052-jdbc
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+170947@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/jdbc.xq.src/jsonitemsequence.cpp'
2--- src/jdbc.xq.src/jsonitemsequence.cpp 2013-06-11 20:47:52 +0000
3+++ src/jdbc.xq.src/jsonitemsequence.cpp 2013-06-22 13:14:25 +0000
4@@ -109,8 +109,8 @@
5 CHECK_EXCEPTION
6 jbyteArray bytes = (jbyteArray) env->CallObjectMethod(oBlob, jBlob.getBytes, 1, length);
7 CHECK_EXCEPTION
8- const unsigned char* byteString = reinterpret_cast<const unsigned char*>(env->GetByteArrayElements(bytes, 0));
9- aValue = itemFactory->createBase64Binary(byteString, length);
10+ const char* byteString = reinterpret_cast<const char*>(env->GetByteArrayElements(bytes, 0));
11+ aValue = itemFactory->createBase64Binary(byteString, length, false);
12 } else {
13 aValue = itemFactory->createJSONNull();
14 }

Subscribers

People subscribed via source and target branches

to all changes: