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
45 changes: 28 additions & 17 deletions dotnet/src/dotnetframework/GxClasses/Middleware/GXHttp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -557,21 +557,29 @@ private void ParseMetadata()
#else
JObject eventMetadata = JSONHelper.ReadJSON<JObject>((string)targetObj.EventsMetadata[eventName.ToString()]);
#endif
eventHandlers[eventCount] = (string)eventMetadata["handler"];
JArray eventInputParms = (JArray)eventMetadata["iparms"];
foreach (JObject inputParm in eventInputParms)
if (eventMetadata != null)
{
AddParmsMetadata(inputParm, DynAjaxEventContext.inParmsMetadata, DynAjaxEventContext.inParmsMetadataHash);
eventUseInternalParms[eventCount] = eventUseInternalParms[eventCount] || IsInternalParm(inputParm);
}
JArray eventOutputParms = (JArray)eventMetadata["oparms"];
if (eventOutputParms != null)
{
foreach (JObject outputParm in eventOutputParms)
eventHandlers[eventCount] = (string)eventMetadata["handler"];
JArray eventInputParms = (JArray)eventMetadata["iparms"];
foreach (JObject inputParm in eventInputParms)
{
AddParmsMetadata(inputParm, DynAjaxEventContext.inParmsMetadata, DynAjaxEventContext.inParmsMetadataHash);
eventUseInternalParms[eventCount] = eventUseInternalParms[eventCount] || IsInternalParm(inputParm);
}
JArray eventOutputParms = (JArray)eventMetadata["oparms"];
if (eventOutputParms != null)
{
AddParmsMetadata(outputParm, DynAjaxEventContext.outParmsMetadata, DynAjaxEventContext.outParmsMetadataHash);
foreach (JObject outputParm in eventOutputParms)
{
AddParmsMetadata(outputParm, DynAjaxEventContext.outParmsMetadata, DynAjaxEventContext.outParmsMetadataHash);
}
}
}
else
{
GXLogging.Warn(log, "The event ", eventName, " is not implemented");
eventHandlers[eventCount] = string.Empty;
}
eventCount++;
}
}
Expand Down Expand Up @@ -1024,14 +1032,17 @@ private void DoInvoke(object[] MethodParms)
for (int i = 0; i < eventHandlers.Length; i++)
{
string handler = eventHandlers[i];
if (i > 0)
if (!string.IsNullOrEmpty(handler))
{
targetObj.PrepareForReuse();
if (i > 0)
{
targetObj.PrepareForReuse();
}
_ = targetObj.GetType().InvokeMember(handler, BindingFlags.Public |
BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.InvokeMethod,
Type.DefaultBinder,
targetObj, (eventUseInternalParms[i] ? MethodParms : null));
}
_ = targetObj.GetType().InvokeMember(handler, BindingFlags.Public |
BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.InvokeMethod,
Type.DefaultBinder,
targetObj, (eventUseInternalParms[i] ? MethodParms : null));
}
}
}
Expand Down