This is an automated email from the ASF dual-hosted git repository.
xiatian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new e349def6a [ISSUE #3095] Handling possible
NullPointerException[MessageUtils] (#4870)
e349def6a is described below
commit e349def6a4eba61b94a8e5b8aeb4ddf9745cfbe7
Author: Zaki <[email protected]>
AuthorDate: Thu May 2 15:15:09 2024 +0800
[ISSUE #3095] Handling possible NullPointerException[MessageUtils] (#4870)
---
.../java/org/apache/eventmesh/client/tcp/common/MessageUtils.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/MessageUtils.java
b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/MessageUtils.java
index 2232e539c..a12436e33 100644
---
a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/MessageUtils.java
+++
b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/MessageUtils.java
@@ -32,6 +32,7 @@ import org.apache.eventmesh.common.protocol.tcp.UserAgent;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.ThreadLocalRandom;
import java.util.stream.IntStream;
@@ -83,12 +84,12 @@ public class MessageUtils {
final Package msg = getPackage(command);
if (message instanceof CloudEvent) {
final CloudEvent cloudEvent = (CloudEvent) message;
- Preconditions.checkNotNull(cloudEvent.getDataContentType(),
"DateContentType cannot be null");
+
Preconditions.checkNotNull(Objects.requireNonNull(cloudEvent.getDataContentType()),
"DateContentType cannot be null");
msg.getHeader().putProperty(Constants.PROTOCOL_TYPE,
CLOUD_EVENTS_PROTOCOL_NAME);
msg.getHeader().putProperty(Constants.PROTOCOL_VERSION,
cloudEvent.getSpecVersion().toString());
msg.getHeader().putProperty(Constants.PROTOCOL_DESC, "tcp");
- final byte[] bodyByte =
EventFormatProvider.getInstance().resolveFormat(cloudEvent.getDataContentType())
+ final byte[] bodyByte =
Objects.requireNonNull(EventFormatProvider.getInstance().resolveFormat(cloudEvent.getDataContentType()))
.serialize((CloudEvent) message);
msg.setBody(bodyByte);
} else if (message instanceof EventMeshMessage) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
