Changeset 2179

Timestamp:

28/05/2008 15:37:13 (22 months ago)

Author:

chris

Message:

Catch exception on reading a directory that doesn't exist, and return a
protocol error message instead.

Files:

• box/trunk/bin/bbstored/BackupCommands.cpp (modified) (3 diffs)

box/trunk/bin/bbstored/BackupCommands.cpp

@@ -14 +14 @@
 
 #include "autogen_BackupProtocolServer.h"
+#include "autogen_RaidFileException.h"
 #include "BackupConstants.h"
 #include "BackupContext.h"
-#include "CollectInBufferStream.h"
+#include "BackupStoreConstants.h"
 #include "BackupStoreDirectory.h"
 #include "BackupStoreException.h"
 #include "BackupStoreFile.h"
-#include "StreamableMemBlock.h"
-#include "BackupStoreConstants.h"
-#include "RaidFileController.h"
 #include "BackupStoreInfo.h"
-#include "RaidFileController.h"
+#include "BufferedStream.h"
+#include "CollectInBufferStream.h"
 #include "FileStream.h"
 #include "InvisibleTempFileStream.h"
-#include "BufferedStream.h"
+#include "RaidFileController.h"
+#include "StreamableMemBlock.h"
 
 #include "MemLeakFindOn.h"
@@ -182 +182 @@
         CHECK_PHASE(Phase_Commands)
 
-        // Ask the context for a directory
-        const BackupStoreDirectory &rdir(rContext.GetDirectory(mObjectID));
-        
         // Store the listing to a stream
         std::auto_ptr<CollectInBufferStream> stream(new CollectInBufferStream);
-        rdir.WriteToStream(*stream, mFlagsMustBeSet, mFlagsNotToBeSet, mSendAttributes,
-                false /* never send dependency info to the client */);
+
+        try
+        {
+                // Ask the context for a directory
+                const BackupStoreDirectory &rdir(
+                        rContext.GetDirectory(mObjectID));
+                rdir.WriteToStream(*stream, mFlagsMustBeSet, 
+                        mFlagsNotToBeSet, mSendAttributes,
+                        false /* never send dependency info to the client */);
+        }
+        catch (RaidFileException &e)
+        {
+                if (e.GetSubType() == RaidFileException::RaidFileDoesntExist)
+                {
+                        return std::auto_ptr<ProtocolObject>(
+                                new BackupProtocolServerError(
+                                        BackupProtocolServerError::ErrorType,
+                                        BackupProtocolServerError::Err_DoesNotExist));
+                }
+                throw;
+        }
+
         stream->SetForReading();
         
@@ -194 +211 @@
         rProtocol.SendStreamAfterCommand(stream.release());
 
-        return std::auto_ptr<ProtocolObject>(new BackupProtocolServerSuccess(mObjectID));
+        return std::auto_ptr<ProtocolObject>(
+                new BackupProtocolServerSuccess(mObjectID));
 }