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

Proposed by Matthias Brantner on 2012-10-23
Status: Merged
Approved by: David Graf on 2012-10-24
Approved revision: 11099
Merged at revision: 11109
Proposed branch: lp:~zorba-coders/zorba/bug-1070551
Merge into: lp:zorba
Diff against target: 36 lines (+3/-1)
3 files modified
ChangeLog (+1/-0)
modules/ExternalModules.conf (+1/-1)
src/store/naive/atomic_items.cpp (+1/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1070551
Reviewer Review Type Date Requested Status
David Graf (community) 2012-10-23 Approve on 2012-10-24
Matthias Brantner Approve on 2012-10-23
Review via email: mp+131099@code.launchpad.net

Commit Message

fix for bug #1070551 (zerr:ZOSE0003 stream read failure)

To post a comment you must log in.
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug-1070551-2012-10-23T21-14-48.425Z is finished. The final status was:

All tests succeeded!

Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending.

David Graf (davidagraf) wrote :

I tested it in sausalito too. Works!

review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug-1070551-2012-10-24T11-02-48.674Z 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 'ChangeLog'
2--- ChangeLog 2012-10-22 20:06:08 +0000
3+++ ChangeLog 2012-10-23 21:23:21 +0000
4@@ -21,6 +21,7 @@
5 * Fixed bug #1067706 (wrong const folding in mutually recursive udfs)
6 * Fixed bug #1021492 (while computeing the "sources" of a prolog var, skip
7 any var-setting exprs that appear in non-used (and non-optimized) functions).
8+ * Fixed bug #1070551 (zerr:ZOSE0003 stream read failure)
9
10 version 2.7
11
12
13=== modified file 'modules/ExternalModules.conf'
14--- modules/ExternalModules.conf 2012-10-08 12:09:36 +0000
15+++ modules/ExternalModules.conf 2012-10-23 21:23:21 +0000
16@@ -40,7 +40,7 @@
17 oauth bzr lp:zorba/oauth-module zorba-2.7
18 process bzr lp:zorba/process-module zorba-2.7
19 read-pdf bzr lp:zorba/read-pdf-module zorba-2.7
20-security bzr lp:zorba/security-module zorba-2.7
21+security bzr lp:zorba/security-module
22 system bzr lp:zorba/system-module zorba-2.7
23 xqxq bzr lp:zorba/xqxq-module zorba-2.7
24 email bzr lp:zorba/email-module zorba-2.7
25
26=== modified file 'src/store/naive/atomic_items.cpp'
27--- src/store/naive/atomic_items.cpp 2012-09-19 21:16:15 +0000
28+++ src/store/naive/atomic_items.cpp 2012-10-23 21:23:21 +0000
29@@ -3711,6 +3711,7 @@
30 std::streambuf * pbuf;
31 pbuf = theIstream.rdbuf();
32 pbuf->pubseekoff(0, std::ios::beg);
33+ theIstream.clear();
34 }
35 theIsConsumed = true;
36 return theIstream;

Subscribers

People subscribed via source and target branches