Changeset 2260 for box/trunk/bin/bbackupquery/BackupQueries.cpp

Timestamp:

21/08/2008 12:14:23 (3 years ago)

Author:

chris

Message:

Use SelfFlushingStream? to ensure that protocol streams are always
flushed, fixes a problem where local file is not readable during
compare, and stream was not flushed, breaking the rest of the compare.

File:

• box/trunk/bin/bbackupquery/BackupQueries.cpp (modified) (2 diffs)

box/trunk/bin/bbackupquery/BackupQueries.cpp

@@ -1710 +1710 @@
                                                 // Compare contents, if it's a regular file not a link
                                                 // Remember, we MUST read the entire stream from the server.
+                                                SelfFlushingStream flushObject(*objectStream);
+
                                                 if(!fileOnServerStream->IsSymLink())
                                                 {
+                                                        SelfFlushingStream flushFile(*fileOnServerStream);
                                                         // Open the local file
                                                         FileStream l(localPath.c_str());
@@ -1741 +1744 @@
                                                         {
                                                                 equal = false;
-                                                        }
-
-                                                        // Must always read the entire decoded stream, if it's not a symlink
-                                                        if(fileOnServerStream->StreamDataLeft())
-                                                        {
-                                                                // Absorb all the data remaining
-                                                                char buffer[2048];
-                                                                while(fileOnServerStream->StreamDataLeft())
-                                                                {
-                                                                        fileOnServerStream->Read(buffer, sizeof(buffer), mrConnection.GetTimeout());
-                                                                }
-                                                        }
-
-                                                        // Must always read the entire encoded stream
-                                                        if(objectStream->StreamDataLeft())
-                                                        {
-                                                                // Absorb all the data remaining
-                                                                char buffer[2048];
-                                                                while(objectStream->StreamDataLeft())
-                                                                {
-                                                                        objectStream->Read(buffer, sizeof(buffer), mrConnection.GetTimeout());
-                                                                }
                                                         }
                                                 }