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

[Matthias Brantner]

fix for bug #898064

fix for bug #898064

[Zorba Build Bot (zorba-buildbot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[William Candillon (wcandillon)]

Works great.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-12-01T18-07-08.291Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-fixing-2011-12-01T18-07-08.291Z 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. Got: 1 Approve, 1 Pending.

[Nicolae Brinza (nbrinza)]

I have approved the changed. A good alternative in my opinion would have been to make seekg() throw an error or to transform it into a no-op.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-12-02T16-42-06.758Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-fixing-2011-12-02T16-42-06.758Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/api/serialization/serializer.cpp'
--- src/api/serialization/serializer.cpp	2011-11-11 07:44:01 +0000
+++ src/api/serialization/serializer.cpp	2011-11-30 18:40:31 +0000
@@ -1682,14 +1682,18 @@
   std::streambuf *  pbuf;
   std::streamsize   read_bytes;
   std::istream& is = item->getStream();
-
-  // prepare the stream
+  std::streampos pos;
   std::ios::iostate const old_exceptions = is.exceptions();
-  is.exceptions( std::ios::badbit | std::ios::failbit );
-  std::streampos const pos = is.tellg();
-  if (pos)
-    is.seekg(0, std::ios::beg);
-  is.exceptions(is.exceptions() & ~std::ios::failbit);
+
+  if (item->isSeekable())
+  {
+    // prepare the stream
+    is.exceptions( std::ios::badbit | std::ios::failbit );
+    pos = is.tellg();
+    if (pos)
+      is.seekg(0, std::ios::beg);
+    is.exceptions(is.exceptions() & ~std::ios::failbit);
+  }
 
   // read bytes and do string expansion
   do
@@ -1703,12 +1707,15 @@
 
   // restore stream's state
   is.clear();                   // clear eofbit
-  if (pos)
+  if (item->isSeekable())
   {
-    is.exceptions(is.exceptions() | std::ios::failbit);
-    is.seekg(pos, std::ios::beg);
+    if (pos != 0 && pos != -1)
+    {
+      is.exceptions(is.exceptions() | std::ios::failbit);
+      is.seekg(pos, std::ios::beg);
+    }
+    is.exceptions(old_exceptions);
   }
-  is.exceptions(old_exceptions);
 }
 
 

=== modified file 'src/store/api/item.h'
--- src/store/api/item.h	2011-10-15 10:41:19 +0000
+++ src/store/api/item.h	2011-11-30 18:40:31 +0000
@@ -807,6 +807,14 @@
   virtual bool isStreamable() const;
 
   /**
+   * Checks whether the item's content is streamable
+   * and the underlying stream is seekable
+   *
+   * @return true only if it is.
+   */
+  virtual bool isSeekable() const;
+
+  /**
    * Gets an istream for the item's content.
    *
    * @return the stream.

=== modified file 'src/store/naive/item.cpp'
--- src/store/naive/item.cpp	2011-10-15 10:41:19 +0000
+++ src/store/naive/item.cpp	2011-11-30 18:40:31 +0000
@@ -1291,6 +1291,11 @@
   return false;
 }
 
+bool Item::isSeekable() const
+{
+  return false;
+}
+
 std::istream& Item::getStream()
 {
   throw ZORBA_EXCEPTION(