3 Commits

Author SHA1 Message Date
Railz
ba0646f27c Set version to 1.5.7 2019-05-08 21:56:55 +02:00
Railz
76922a4039 Changed cache-check to dictionary
> Fixed bug, not restoring cache
2019-05-08 21:56:34 +02:00
Railz
e3869b26c3 removed inner Exception 2019-04-20 10:29:52 +02:00
3 changed files with 13 additions and 8 deletions

View File

@@ -71,7 +71,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
}
catch(InvalidOperationException ex)
{
throw new InvalidOperationException($"Cannot init foreignObject-field '{fi.Name}' of '{classType.Name}'. {ex.Message}", ex);
throw new InvalidOperationException($"Cannot init foreignObject-field '{fi.Name}' of '{classType.Name}'. {ex.Message}");
}
}
}

View File

@@ -8,7 +8,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
{
public class ClassAction
{
private static List<Type> initiatedClassTypes = new List<Type>() { };
private static Dictionary<Type, DbObject> initiatedClassTypes = new Dictionary<Type, DbObject>() { };
/// <summary>
/// Initiates the attribute-system and preloads all necessary information<para/>
/// INFO: Will initiate necessary foreignObjects recursively!<para/>
@@ -18,16 +18,21 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
/// <returns>DbObject-attribute corresponding to the class</returns>
public static DbObject Init(Type classType)
{
// Check if given class is marked as dbObject
if (!(classType.GetCustomAttribute(typeof(DbObject), true) is DbObject dbObject)) throw new InvalidOperationException($"Cannot init '{classType.Name}'. Missing Attribute 'DbObject'");
DbObject cachedDbObject;
initiatedClassTypes.TryGetValue(classType, out cachedDbObject);
if (!initiatedClassTypes.Contains(classType))
if (cachedDbObject == null)
{
// Check if given class is marked as dbObject
if (!(classType.GetCustomAttribute(typeof(DbObject), true) is DbObject dbObject)) throw new InvalidOperationException($"Cannot init '{classType.Name}'. Missing Attribute 'DbObject'");
dbObject.Init(classType); // Init dbObject
initiatedClassTypes.Add(classType); // Set it to the list
initiatedClassTypes.Add(classType, dbObject); // Set it to the list
cachedDbObject = dbObject;
}
return dbObject;
return cachedDbObject;
}

View File

@@ -4,7 +4,7 @@
<TargetFramework>netcoreapp2.1</TargetFramework>
<RootNamespace>eu.railduction.netcore.dll.Database_Attribute_System</RootNamespace>
<SignAssembly>false</SignAssembly>
<Version>1.5.6</Version>
<Version>1.5.7</Version>
</PropertyGroup>
</Project>