From 5227fcd0a029b95301e6e1988268ea11afb4293f Mon Sep 17 00:00:00 2001
From: d4nielyan9 <chengchang.yang@mulesoft.com>
Date: Fri, 24 Jan 2025 01:56:15 -0800
Subject: [PATCH] andle missing fields in DefaultMessageBuilder and ensure that
 one field is not serialized in DefaultEventBuilder

---
 .../runtime/core/internal/event/DefaultEventBuilder.java  | 2 +-
 .../core/internal/message/DefaultMessageBuilder.java      | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/mule/runtime/core/internal/event/DefaultEventBuilder.java b/core/src/main/java/org/mule/runtime/core/internal/event/DefaultEventBuilder.java
index 2da2eab94110..7ce5753282c1 100644
--- a/core/src/main/java/org/mule/runtime/core/internal/event/DefaultEventBuilder.java
+++ b/core/src/main/java/org/mule/runtime/core/internal/event/DefaultEventBuilder.java
@@ -418,7 +418,7 @@ public static class InternalEventImplementation implements InternalEvent {
     private final boolean notificationsEnabled;
 
     private final CaseInsensitiveHashMap<String, TypedValue<?>> variables;
-    private final CaseInsensitiveHashMap<String, TypedValue<?>> parameters;
+    private transient final CaseInsensitiveHashMap<String, TypedValue<?>> parameters;
     private final CaseInsensitiveHashMap<String, String> loggingVariables;
 
     private final String legacyCorrelationId;
diff --git a/core/src/main/java/org/mule/runtime/core/internal/message/DefaultMessageBuilder.java b/core/src/main/java/org/mule/runtime/core/internal/message/DefaultMessageBuilder.java
index 6ffd846f851d..1e71a21183ee 100644
--- a/core/src/main/java/org/mule/runtime/core/internal/message/DefaultMessageBuilder.java
+++ b/core/src/main/java/org/mule/runtime/core/internal/message/DefaultMessageBuilder.java
@@ -23,6 +23,7 @@
 import org.mule.runtime.api.metadata.MapDataType;
 import org.mule.runtime.api.metadata.MediaType;
 import org.mule.runtime.api.metadata.TypedValue;
+import org.mule.runtime.api.util.CaseInsensitiveMapWrapper;
 import org.mule.runtime.core.api.message.ExceptionPayload;
 import org.mule.runtime.core.internal.message.InternalMessage.CollectionBuilder;
 import org.mule.runtime.core.privileged.metadata.DefaultCollectionDataType;
@@ -35,8 +36,10 @@
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
+import jakarta.activation.DataHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,6 +52,11 @@ public final class DefaultMessageBuilder
   private TypedValue payload = of(NULL_TYPED_VALUE);
   private TypedValue attributes = of(NULL_TYPED_VALUE);
 
+  private final Map<String, TypedValue<Serializable>> inboundProperties = new CaseInsensitiveMapWrapper<>();
+  private final Map<String, TypedValue<Serializable>> outboundProperties = new CaseInsensitiveMapWrapper<>();
+  private Map<String, DataHandler> inboundAttachments = new LinkedHashMap<>();
+  private Map<String, DataHandler> outboundAttachments = new LinkedHashMap<>();
+
   public DefaultMessageBuilder() {}
 
   public DefaultMessageBuilder(org.mule.runtime.api.message.Message message) {