Changeset 1829 for trunk/eraser6/Eraser.Manager/DirectExecutor.cs

Timestamp:

2/12/2010 6:24:18 AM (2 years ago)

Author:

lowjoel

Message:

When we load a task list from the stream the stream may not be valid. If so, throw an InvalidDataException? instead. This prevents exceptions which are specific to the implementation of the Executor class from letting its exceptions bubble up the stack.

File:

• trunk/eraser6/Eraser.Manager/DirectExecutor.cs (modified) (1 diff)

trunk/eraser6/Eraser.Manager/DirectExecutor.cs

@@ -958 +958 @@
                     StreamingContextStates.All, Owner);
                 BinaryFormatter formatter = new BinaryFormatter(null, context);
-                List<Task> deserialised = (List<Task>)formatter.Deserialize(stream);
-                list.AddRange(deserialised);
-
-                foreach (Task task in deserialised)
-                {
-                    Owner.OnTaskAdded(new TaskEventArgs(task));
-                    if (task.Schedule is RecurringSchedule)
-                        Owner.ScheduleTask(task);
+
+                try
+                {
+                    List<Task> deserialised = (List<Task>)formatter.Deserialize(stream);
+                    list.AddRange(deserialised);
+
+                    foreach (Task task in deserialised)
+                    {
+                        Owner.OnTaskAdded(new TaskEventArgs(task));
+                        if (task.Schedule is RecurringSchedule)
+                            Owner.ScheduleTask(task);
+                    }
+                }
+                catch (FileLoadException e)
+                {
+                    throw new InvalidDataException(e.Message, e);
+                }
+                catch (SerializationException e)
+                {
+                    throw new InvalidDataException(e.Message, e);
                 }
             }