This is an automated email from the ASF dual-hosted git repository.
mxsm 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 1a5e06c25 [ISSUE #4770] Empty class member cause NullpointerException
(#4777)
1a5e06c25 is described below
commit 1a5e06c258d99bdab3d9ed6af7d73ab5d3dad16c
Author: scwlkq <[email protected]>
AuthorDate: Tue Feb 20 23:51:52 2024 +0800
[ISSUE #4770] Empty class member cause NullpointerException (#4777)
* Add null check in writeOffset method
* delete todo
* Move data.put inside null check in writeOffset method
* simplify if judgement
* remove dev environment
* fix style
---
.../org/apache/eventmesh/openconnect/util/CloudEventUtil.java | 2 +-
.../offsetmgmt/api/storage/OffsetStorageWriterImpl.java | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git
a/eventmesh-openconnect/eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/util/CloudEventUtil.java
b/eventmesh-openconnect/eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/util/CloudEventUtil.java
index 5d4a77ff7..3fb5ea2b7 100644
---
a/eventmesh-openconnect/eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/util/CloudEventUtil.java
+++
b/eventmesh-openconnect/eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/util/CloudEventUtil.java
@@ -67,7 +67,7 @@ public class CloudEventUtil {
public static ConnectRecord convertEventToRecord(CloudEvent event) {
byte[] body = Objects.requireNonNull(event.getData()).toBytes();
LogUtil.info(log, "handle receive events {}", () -> new
String(event.getData().toBytes(), Constants.DEFAULT_CHARSET));
- // todo: recordPartition & recordOffset
+
ConnectRecord connectRecord = new ConnectRecord(null, null,
System.currentTimeMillis(), body);
for (String extensionName : event.getExtensionNames()) {
connectRecord.addExtension(extensionName,
Objects.requireNonNull(event.getExtension(extensionName)).toString());
diff --git
a/eventmesh-openconnect/eventmesh-openconnect-offsetmgmt-plugin/eventmesh-openconnect-offsetmgmt-api/src/main/java/org/apache/eventmesh/openconnect/offsetmgmt/api/storage/OffsetStorageWriterImpl.java
b/eventmesh-openconnect/eventmesh-openconnect-offsetmgmt-plugin/eventmesh-openconnect-offsetmgmt-api/src/main/java/org/apache/eventmesh/openconnect/offsetmgmt/api/storage/OffsetStorageWriterImpl.java
index 682205c4a..76931d85a 100644
---
a/eventmesh-openconnect/eventmesh-openconnect-offsetmgmt-plugin/eventmesh-openconnect-offsetmgmt-api/src/main/java/org/apache/eventmesh/openconnect/offsetmgmt/api/storage/OffsetStorageWriterImpl.java
+++
b/eventmesh-openconnect/eventmesh-openconnect-offsetmgmt-plugin/eventmesh-openconnect-offsetmgmt-api/src/main/java/org/apache/eventmesh/openconnect/offsetmgmt/api/storage/OffsetStorageWriterImpl.java
@@ -53,9 +53,12 @@ public class OffsetStorageWriterImpl implements
OffsetStorageWriter, Closeable {
}
@Override
- public void writeOffset(RecordPartition partition, RecordOffset position) {
- ConnectorRecordPartition extendRecordPartition = new
ConnectorRecordPartition(connectorName, partition.getPartition());
- data.put(extendRecordPartition, position);
+ public void writeOffset(RecordPartition partition, RecordOffset offset) {
+ ConnectorRecordPartition extendRecordPartition;
+ if (partition != null) {
+ extendRecordPartition = new
ConnectorRecordPartition(connectorName, partition.getPartition());
+ data.put(extendRecordPartition, offset);
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
