Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions dotnet/src/dotnetframework/GxClasses/Helpers/GXMetadata.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,8 @@ static public Type FindType(string defaultAssemblyName, string ns, string clssWi
string clss = string.IsNullOrEmpty(ns) ? clssWithoutNamespace : string.Format("{0}.{1}", ns, clssWithoutNamespace);
Type objType = null;
string appNS;
loadedAssemblies.TryGetValue(clss, out objType);
if (objType == null)
{
if (!loadedAssemblies.TryGetValue(clss, out objType))
{
if (defaultAssembly != null)
{
try
Expand Down Expand Up @@ -199,15 +198,15 @@ static public Type FindType(string defaultAssemblyName, string ns, string clssWi
}
}

if (objType == null)
{
GXLogging.Error(log, "Failed to load type: " + clss + " from currentdomain");
throw new GxClassLoaderException("Failed to load type: " + clss);
}
}

loadedAssemblies[clss] = objType;
}
if (objType == null)
{
GXLogging.Error(log, "Failed to load type: " + clss + " from currentdomain");
throw new GxClassLoaderException("Failed to load type: " + clss);
}
return objType;

}
Expand Down