Skip to content

[API Queue] Fix assembly name to load SDT definitions #668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 9, 2022
Merged

[API Queue] Fix assembly name to load SDT definitions #668

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 2 additions & 14 deletions dotnet/src/dotnetcore/Providers/Messaging/GXQueue/SimpleMessageQueue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class SimpleMessageQueue
private const string SDT_MESSAGEPROPERTY_CLASS_NAME = @"SdtMessageProperty";
private const string SDT_MESSAGERESULT_CLASS_NAME = @"SdtMessageResult";
private const string NAMESPACE = @"GeneXus.Programs.genexusmessagingqueue.simplequeue";
private const string GENEXUS_COMMON_DLL = @"GeneXus.Programs.Common.dll";
private const string MODULE_DLL = @"GeneXusMessagingQueue";

public SimpleMessageQueue()
{
Expand Down Expand Up @@ -228,9 +228,7 @@ private static void LoadAssemblyIfRequired()
{
if (assembly == null)
{
assembly = LoadAssembly(Path.Combine(GxContext.StaticPhysicalPath(), GENEXUS_COMMON_DLL));
if (assembly == null)
assembly = LoadAssembly(Path.Combine(GxContext.StaticPhysicalPath(), "bin", GENEXUS_COMMON_DLL));
assembly = AssemblyLoader.LoadAssembly(new AssemblyName(MODULE_DLL));
}
}

Expand Down Expand Up @@ -326,16 +324,6 @@ private GxUserType TransformMessageQueueResult(MessageQueueResult messageQueueRe
return messageResultSDT;
}
return null;
}
private static Assembly LoadAssembly(string fileName)
{
if (File.Exists(fileName))
{
Assembly assemblyLoaded = Assembly.LoadFrom(fileName);
return assemblyLoaded;
}
else
return null;
}
public GxUserType SendMessage(GxUserType simpleQueueMessage, out GXBaseCollection<SdtMessages_Message> errorMessages, out bool success)
{
Expand Down