Improve error handling in GXMetadata.cs when looking for an class in …

…different name spaces.
genexuslabs · Sep 17, 2024 · 5becd8b · 5becd8b
1 parent 4c87d15
commit 5becd8b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/dotnet/src/dotnetcore/GxClasses.Web/Middleware/HandlerFactory.cs b/dotnet/src/dotnetcore/GxClasses.Web/Middleware/HandlerFactory.cs
@@ -270,7 +270,7 @@ internal static Type GetHandlerType(string assemblyName, string className)
 			try
 			{
 
-                objType = GeneXus.Metadata.ClassLoader.FindType(assemblyName, className, null);
+                objType = GeneXus.Metadata.ClassLoader.FindType(assemblyName, className, null, false, true);
 				if (objType == null)
 
 					objType = Assembly.Load(new AssemblyName(assemblyName)).GetType(className);

diff --git a/dotnet/src/dotnetframework/GxClasses/Helpers/GXMetadata.cs b/dotnet/src/dotnetframework/GxClasses/Helpers/GXMetadata.cs
@@ -70,13 +70,13 @@ static public void Execute(object instance, string mthd, Object[] args)
 			}
 		}
         static ConcurrentDictionary<string, Type> loadedAssemblies = new ConcurrentDictionary<string, Type>();
-		static public Type FindType(string defaultAssemblyName, string clss, Assembly defaultAssembly, bool ignoreCase = false)
+		static public Type FindType(string defaultAssemblyName, string clss, Assembly defaultAssembly, bool ignoreCase = false, bool ignoreError=false)
 		{
-			return FindType(defaultAssemblyName, string.Empty, clss, defaultAssembly, ignoreCase);
+			return FindType(defaultAssemblyName, string.Empty, clss, defaultAssembly, ignoreCase, ignoreError);
 		}
 		//ns = kb Namespace
 		//clssWithoutNamespace = fullname genexus object (includes module), p.e. genexus.sd.synchronization.offlineeventreplicator
-		static public Type FindType(string defaultAssemblyName, string ns, string clssWithoutNamespace, Assembly defaultAssembly, bool ignoreCase = false)
+		static public Type FindType(string defaultAssemblyName, string ns, string clssWithoutNamespace, Assembly defaultAssembly, bool ignoreCase = false, bool ignoreError = false)
 		{
 
 			string clss = string.IsNullOrEmpty(ns) ? clssWithoutNamespace : string.Format("{0}.{1}", ns, clssWithoutNamespace);
@@ -143,7 +143,7 @@ static public Type FindType(string defaultAssemblyName, string ns, string clssWi
 				{
 					if (ns != appNS) 
 					{
-						return FindType(defaultAssemblyName, appNS, clssWithoutNamespace, defaultAssembly);
+						return FindType(defaultAssemblyName, appNS, clssWithoutNamespace, defaultAssembly, ignoreCase, ignoreError);
 					}
 				}
 				if (objType == null)
@@ -168,7 +168,7 @@ static public Type FindType(string defaultAssemblyName, string ns, string clssWi
 							defaultAssemblyName = parts[1];
 							clss = parts[0];
 						}
-						return FindType(defaultAssemblyName, string.Empty, clss, defaultAssembly);
+						return FindType(defaultAssemblyName, string.Empty, clss, defaultAssembly, ignoreCase, ignoreError);
 					}
 				}
 
@@ -207,8 +207,13 @@ 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);
+				if (ignoreError)
+					GXLogging.Warn(log, "Failed to load type: " + clss + " from currentdomain");
+				else
+				{
+					GXLogging.Error(log, "Failed to load type: " + clss + " from currentdomain");
+					throw new GxClassLoaderException("Failed to load type: " + clss);
+				}
 			}
 			return objType;