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

[Matthias Brantner]

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

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1070551-2012-10-23T21-14-48.425Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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)]

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

[David Graf (davidagraf)]

I tested it in sausalito too. Works!

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1070551-2012-10-24T11-02-48.674Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1070551-2012-10-24T11-02-48.674Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2012-10-22 20:06:08 +0000
+++ ChangeLog	2012-10-23 21:23:21 +0000
@@ -21,6 +21,7 @@
   * Fixed bug #1067706 (wrong const folding in mutually recursive udfs)
   * Fixed bug #1021492 (while computeing the "sources" of a prolog var, skip
     any var-setting exprs that appear in non-used (and non-optimized) functions). 
+  * Fixed bug #1070551 (zerr:ZOSE0003 stream read failure)
 
 version 2.7
 

=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf	2012-10-08 12:09:36 +0000
+++ modules/ExternalModules.conf	2012-10-23 21:23:21 +0000
@@ -40,7 +40,7 @@
 oauth           bzr  lp:zorba/oauth-module            zorba-2.7
 process         bzr  lp:zorba/process-module          zorba-2.7
 read-pdf        bzr  lp:zorba/read-pdf-module         zorba-2.7
-security        bzr  lp:zorba/security-module         zorba-2.7
+security        bzr  lp:zorba/security-module
 system          bzr  lp:zorba/system-module           zorba-2.7
 xqxq            bzr  lp:zorba/xqxq-module             zorba-2.7
 email           bzr  lp:zorba/email-module            zorba-2.7

=== modified file 'src/store/naive/atomic_items.cpp'
--- src/store/naive/atomic_items.cpp	2012-09-19 21:16:15 +0000
+++ src/store/naive/atomic_items.cpp	2012-10-23 21:23:21 +0000
@@ -3711,6 +3711,7 @@
     std::streambuf * pbuf;
     pbuf = theIstream.rdbuf();
     pbuf->pubseekoff(0, std::ios::beg);
+    theIstream.clear();
   }
   theIsConsumed = true;
   return theIstream;