Skip to content

fix:listAcls error happens when actions or sourceIps is null #378

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix:listAcls error happens when actions or sourceIps is null #378

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/main/java/org/apache/rocketmq/dashboard/model/AclInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

package org.apache.rocketmq.dashboard.model;

import org.apache.commons.collections.CollectionUtils;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
Expand Down Expand Up @@ -191,8 +193,8 @@ public void copyFrom(org.apache.rocketmq.remoting.protocol.body.AclInfo source)
for (org.apache.rocketmq.remoting.protocol.body.AclInfo.PolicyEntryInfo entry : policy.getEntries()) {
PolicyEntryInfo copiedEntry = new PolicyEntryInfo();
copiedEntry.setResource(entry.getResource());
copiedEntry.setActions(new ArrayList<>(entry.getActions()));
copiedEntry.setSourceIps(new ArrayList<>(entry.getSourceIps()));
copiedEntry.setActions(CollectionUtils.isEmpty(entry.getActions()) ? new ArrayList<>() : new ArrayList<>(entry.getActions()));
copiedEntry.setSourceIps(CollectionUtils.isEmpty(entry.getSourceIps()) ? new ArrayList<>() : new ArrayList<>(entry.getSourceIps()));
copiedEntry.setDecision(entry.getDecision());
copiedEntries.add(copiedEntry);
}
Expand Down