TypeStringからTypeを取得する処理でErrorになった場合のcatch句を書いて、NULLを返しても無視するように修正。catch句の中身は現状は空にしてある。

Author: a3geek

Assets/XmlStorage/Scripts/Components/Aggregations/Aggregation.cs

@@ -103,6 +103,10 @@ public void AddData(Elements list)
                 var type = e.ValueType;
                 var saveType = e.SaveType;
 
+                if(e.ValueType == null || saveType == null)
+                {
+                    continue;
+                }
                 if(this.dictionary.ContainsKey(saveType) == false)
                 {
                     this.dictionary[saveType] = new Dictionary<string, object>();

Assets/XmlStorage/Scripts/Components/Data/DataElement.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Reflection;
 
 namespace XmlStorage.Components.Data
@@ -126,24 +127,27 @@ private Type GetType(string typeName)
             }
 
             // If the TypeName is a full name, then we can try loading the defining assembly directly
-            if(typeName.Contains("."))
+            if(typeName.Contains(".") == true)
             {
                 // Get the name of the assembly (Assumption is that we are using 
                 // fully-qualified type names)
                 var assemblyName = typeName.Substring(0, typeName.IndexOf('.'));
 
                 // Attempt to load the indicated Assembly
-                var assembly = Assembly.Load(assemblyName);
-                if(assembly == null)
+                try
                 {
-                    return null;
-                }
+                    var assembly = Assembly.Load(assemblyName);
 
-                // Ask that assembly to return the proper Type
-                type = assembly.GetType(typeName);
-                if(type != null)
+                    // Ask that assembly to return the proper Type
+                    type = assembly.GetType(typeName);
+                    if(type != null)
+                    {
+                        return type;
+                    }
+                }
+                catch(SystemException e) when(e is FileNotFoundException || e is NullReferenceException)
                 {
-                    return type;
+                    return null;
                 }
             }
 
@@ -153,19 +157,22 @@ private Type GetType(string typeName)
 
             foreach(var assemblyName in referencedAssemblies)
             {
-                // Load the referenced assembly
-                var assembly = Assembly.Load(assemblyName);
-
-                if(assembly != null)
+                try
                 {
+                    // Load the referenced assembly
+                    var assembly = Assembly.Load(assemblyName);
+
                     // See if that assembly defines the named type
                     type = assembly.GetType(typeName);
-
                     if(type != null)
                     {
                         return type;
                     }
                 }
+                catch(SystemException e) when(e is FileNotFoundException || e is NullReferenceException)
+                {
+                    continue;
+                }
             }
 
             // The type just couldn't be found...

Assets/XmlStorage/Version.txt

@@ -1 +1 @@
-7.0.0
+7.0.1