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

Timestamp:

04/23/09 14:22:29 (15 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/ArrayDecomposer.cs (modified) (2 diffs)

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

@@ -54 +54 @@
     }
 
-    public object CreateInstance(Type t, IEnumerable<Tag> metaInfo) {
-      IEnumerator<Tag> e = metaInfo.GetEnumerator();
-      e.MoveNext();
-      int rank = (int)e.Current.Value;
-      int[] lengths = new int[rank];
-      for (int i = 0; i < rank; i++) {
+    public object CreateInstance(Type t, IEnumerable<Tag> metaInfo) {      
+      try {
+        IEnumerator<Tag> e = metaInfo.GetEnumerator();
         e.MoveNext();
-        lengths[i] = (int)e.Current.Value;
-      }
-      int[] lowerBounds = new int[rank];
-      for (int i = 0; i < rank; i++) {
-        e.MoveNext();
-        lowerBounds[i] = (int)e.Current.Value;
-      }
-      return Array.CreateInstance(t.GetElementType(), lengths, lowerBounds);
+        int rank = (int)e.Current.Value;
+        int[] lengths = new int[rank];
+        for (int i = 0; i < rank; i++) {
+          e.MoveNext();
+          lengths[i] = (int)e.Current.Value;
+        }
+        int[] lowerBounds = new int[rank];
+        for (int i = 0; i < rank; i++) {
+          e.MoveNext();
+          lowerBounds[i] = (int)e.Current.Value;
+        }
+        return Array.CreateInstance(t.GetElementType(), lengths, lowerBounds);
+      } catch (InvalidOperationException x) {
+        throw new PersistenceException("Insufficient meta information to construct array instance.", x);
+      } catch (InvalidCastException x) {
+        throw new PersistenceException("Invalid format of array metainfo.", x);
+      }      
     }
 
@@ -83 +89 @@
       int[] positions = (int[])lowerBounds.Clone();
       IEnumerator<Tag> e = elements.GetEnumerator();
-      while (e.MoveNext()) {
-        int[] currentPositions = positions;
-        a.SetValue(e.Current.Value, currentPositions);
-        positions[0] += 1;
-        for (int i = 0; i < a.Rank - 1; i++) {
-          if (positions[i] >= lengths[i] + lowerBounds[i]) {
-            positions[i] = lowerBounds[i];
-            positions[i + 1] += 1;
-          } else {
-            break;
+      try {
+        while (e.MoveNext()) {
+          int[] currentPositions = positions;
+          a.SetValue(e.Current.Value, currentPositions);
+          positions[0] += 1;
+          for (int i = 0; i < a.Rank - 1; i++) {
+            if (positions[i] >= lengths[i] + lowerBounds[i]) {
+              positions[i] = lowerBounds[i];
+              positions[i + 1] += 1;
+            } else {
+              break;
+            }
           }
         }
+      } catch (InvalidOperationException x) {
+        throw new PersistenceException("Insufficient data to fill array instance", x);
+      } catch (InvalidCastException x) {
+        throw new PersistenceException("Invalid element data. Cannot fill array", x);
+      } catch (IndexOutOfRangeException x) {
+        throw new PersistenceException("Too many elements during array deserialization", x);
       }
     }