Skip to content

Commit 1a5e06c

Browse files
authored
[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
1 parent 5cc065f commit 1a5e06c

File tree

2 files changed

+7
-4
lines changed
  • eventmesh-openconnect
    • eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/util
    • eventmesh-openconnect-offsetmgmt-plugin/eventmesh-openconnect-offsetmgmt-api/src/main/java/org/apache/eventmesh/openconnect/offsetmgmt/api/storage

2 files changed

+7
-4
lines changed

Diff for: eventmesh-openconnect/eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/util/CloudEventUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public static CloudEvent convertRecordToEvent(ConnectRecord connectRecord) {
6767
public static ConnectRecord convertEventToRecord(CloudEvent event) {
6868
byte[] body = Objects.requireNonNull(event.getData()).toBytes();
6969
LogUtil.info(log, "handle receive events {}", () -> new String(event.getData().toBytes(), Constants.DEFAULT_CHARSET));
70-
// todo: recordPartition & recordOffset
70+
7171
ConnectRecord connectRecord = new ConnectRecord(null, null, System.currentTimeMillis(), body);
7272
for (String extensionName : event.getExtensionNames()) {
7373
connectRecord.addExtension(extensionName, Objects.requireNonNull(event.getExtension(extensionName)).toString());

Diff for: eventmesh-openconnect/eventmesh-openconnect-offsetmgmt-plugin/eventmesh-openconnect-offsetmgmt-api/src/main/java/org/apache/eventmesh/openconnect/offsetmgmt/api/storage/OffsetStorageWriterImpl.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,12 @@ public OffsetStorageWriterImpl(String connectorName, OffsetManagementService off
5353
}
5454

5555
@Override
56-
public void writeOffset(RecordPartition partition, RecordOffset position) {
57-
ConnectorRecordPartition extendRecordPartition = new ConnectorRecordPartition(connectorName, partition.getPartition());
58-
data.put(extendRecordPartition, position);
56+
public void writeOffset(RecordPartition partition, RecordOffset offset) {
57+
ConnectorRecordPartition extendRecordPartition;
58+
if (partition != null) {
59+
extendRecordPartition = new ConnectorRecordPartition(connectorName, partition.getPartition());
60+
data.put(extendRecordPartition, offset);
61+
}
5962
}
6063

6164
/**

0 commit comments

Comments
 (0)