Skip to content

[ISSUE #3105] Check for NPE #3132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonyangx merged 3 commits into from
Feb 14, 2023
Merged

[ISSUE #3105] Check for NPE #3132

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b3c7a0
[ISSUE #3105] Check for NPE
Bannirui Feb 13, 2023
e6c73a6
Merge branch 'master' into fix-3105
Bannirui Feb 13, 2023
a9931d6
[ISSUE #3105] Code style detect
Bannirui Feb 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ...c/main/java/org/apache/eventmesh/registry/zookeeper/service/ZookeeperRegistryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@ public List<EventMeshDataInfo> findEventMeshInfoByCluster(String clusterName) th
EventMeshInstance eventMeshInstance = JsonUtils.parseObject(new String(data, StandardCharsets.UTF_8), EventMeshInstance.class);

EventMeshDataInfo eventMeshDataInfo =
new EventMeshDataInfo(clusterName, serviceName, endpoint, stat.getMtime(), eventMeshInstance.getMetaData());
new EventMeshDataInfo(clusterName, serviceName, endpoint, stat.getMtime(),
Objects.requireNonNull(eventMeshInstance, "instance must not be Null").getMetaData());

eventMeshDataInfoList.add(eventMeshDataInfo);
}
Expand Down Expand Up @@ -203,7 +204,8 @@ public List<EventMeshDataInfo> findAllEventMeshInfo() throws RegistryException {
EventMeshInstance eventMeshInstance = JsonUtils.parseObject(new String(data, StandardCharsets.UTF_8), EventMeshInstance.class);

EventMeshDataInfo eventMeshDataInfo =
new EventMeshDataInfo(clusterName, serviceName, endpoint, stat.getMtime(), eventMeshInstance.getMetaData());
new EventMeshDataInfo(clusterName, serviceName, endpoint, stat.getMtime(),
Objects.requireNonNull(eventMeshInstance, "instance must not be Null").getMetaData());

eventMeshDataInfoList.add(eventMeshDataInfo);
}
Expand Down Expand Up @@ -256,7 +258,8 @@ public boolean register(EventMeshRegisterInfo eventMeshRegisterInfo) throws Regi
.orSetData()
.creatingParentsIfNeeded()
.withMode(CreateMode.EPHEMERAL)
.forPath(path, JsonUtils.toJSONString(eventMeshInstance).getBytes(StandardCharsets.UTF_8));
.forPath(path,
Objects.requireNonNull(JsonUtils.toJSONString(eventMeshInstance), "instance must not be Null").getBytes(StandardCharsets.UTF_8));

eventMeshRegisterInfoMap.put(eventMeshName, eventMeshRegisterInfo);
} catch (Exception e) {
Expand Down