You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eventmesh.apache.org by mi...@apache.org on 2022/10/25 15:06:38 UTC
[incubator-eventmesh] branch master updated: [ISSUE #1715] Possible Null Pointer Dereference
This is an automated email from the ASF dual-hosted git repository.
mikexue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new a35357aa [ISSUE #1715] Possible Null Pointer Dereference
new e92c0d68 Merge pull request #1846 from soundarrajan-official/message-transfer-task
a35357aa is described below
commit a35357aa2a8d3015c83880ebb40e87ebb3518569
Author: Soundarrajan <so...@gmail.com>
AuthorDate: Tue Oct 25 16:45:33 2022 +0530
[ISSUE #1715] Possible Null Pointer Dereference
---
.../runtime/core/protocol/tcp/client/task/MessageTransferTask.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/MessageTransferTask.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/MessageTransferTask.java
index ff8f91ca..74d89b90 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/MessageTransferTask.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/MessageTransferTask.java
@@ -46,6 +46,7 @@ import org.apache.eventmesh.trace.api.common.EventMeshTraceConstants;
import org.apache.commons.lang3.StringUtils;
import java.nio.charset.StandardCharsets;
+import java.util.Objects;
import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
@@ -110,7 +111,7 @@ public class MessageTransferTask extends AbstractTask {
throw new Exception("event is null");
}
- String content = new String(event.getData().toBytes(), StandardCharsets.UTF_8);
+ String content = new String(Objects.requireNonNull(event.getData()).toBytes(), StandardCharsets.UTF_8);
if (content.length() > eventMeshTCPServer.getEventMeshTCPConfiguration().eventMeshEventSize) {
throw new Exception("event size exceeds the limit: "
+ eventMeshTCPServer.getEventMeshTCPConfiguration().eventMeshEventSize);
@@ -255,7 +256,8 @@ public class MessageTransferTask extends AbstractTask {
UpStreamMsgContext upStreamMsgContext = new UpStreamMsgContext(
session, event, pkg.getHeader(), startTime, taskExecuteTime);
upStreamMsgContext.delay(10000);
- session.getClientGroupWrapper().get().getEventMeshTcpRetryer()
+ Objects.requireNonNull(
+ session.getClientGroupWrapper().get()).getEventMeshTcpRetryer()
.pushRetry(upStreamMsgContext);
session.getSender().failMsgCount.incrementAndGet();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org