Changeset 1598 for box/chris/merge/lib/backupclient/BackupStoreFile.cpp

Timestamp:

28/04/2007 20:57:24 (5 years ago)

Author:

chris

Message:

Fix getting files with uncertain size (over 2GB) from the store. Failure
to drain the stream will leave the EOF byte in it, which breaks further
communications with the store over the same connection. (refs #2, refs #3)

File:

• box/chris/merge/lib/backupclient/BackupStoreFile.cpp (modified) (1 diff)

box/chris/merge/lib/backupclient/BackupStoreFile.cpp

@@ -293 +293 @@
 
                 out.Close();
+
+                // The stream might have uncertain size, in which case
+                // we need to drain it to get the 
+                // Protocol::ProtocolStreamHeader_EndOfStream byte
+                // out of our connection stream.
+                char buffer[1];
+                int drained = rEncodedFile.Read(buffer, 1);
+                ASSERT(drained == 0);
                 
                 // Write the attributes