Changeset 1625 for trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/DictionaryDecomposer.cs

Timestamp:

04/23/09 14:22:29 (16 years ago)

Author:

epitzer

Message:

Added PersistenceException used consistently for all error conditions in the persistence framework (#548)

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/DictionaryDecomposer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/DictionaryDecomposer.cs

@@ -39 +39 @@
       IDictionary dict = (IDictionary)instance;
       IEnumerator<Tag> iter = o.GetEnumerator();
-      while (iter.MoveNext()) {
-        Tag key = iter.Current;
-        iter.MoveNext();
-        Tag value = iter.Current;
-        dict.Add(key.Value, value.Value);
-      }
+      try {
+        while (iter.MoveNext()) {
+          Tag key = iter.Current;
+          iter.MoveNext();
+          Tag value = iter.Current;
+          dict.Add(key.Value, value.Value);
+        }
+      } catch (InvalidOperationException e) {
+        throw new PersistenceException("Dictionaries must contain an even number of elements (key+value).", e);
+      } catch (NotSupportedException e) {
+        throw new PersistenceException("The serialized dictionary type was read-only or had a fixed size and cannot be deserialized.", e);
+      } catch (ArgumentNullException e) {
+        throw new PersistenceException("Dictionary key was null.", e);
+      } catch (ArgumentException e) {
+        throw new PersistenceException("Duplicate dictionary key.", e);
+      }      
     }
   }