This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new fc05c4d fix pr#9796 (#9834)
fc05c4d is described below
commit fc05c4dbfed64edbc93287b303c6d9cd5358e6b5
Author: JingShang Lu <[email protected]>
AuthorDate: Fri Mar 26 16:57:07 2021 +0800
fix pr#9796 (#9834)
* fix pr#9796
---
.../governance/context/metadata/GovernanceMetaDataContexts.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
index 50953d7..0aec091 100644
---
a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
+++
b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
@@ -420,7 +420,7 @@ public final class GovernanceMetaDataContexts implements
MetaDataContexts {
}
Map<ShardingSphereUser, ShardingSpherePrivilege> result =
PrivilegeBuilder.build(metaDataContexts.getMetaDataMap().values(), users,
metaDataContexts.getProps());
for (Entry<ShardingSphereUser, ShardingSpherePrivilege> entry :
result.entrySet()) {
- Optional<ShardingSphereUser> user =
metaDataContexts.getAuthentication().getAuthentication().keySet().stream().filter(t
-> t.getGrantee().equals(t.getGrantee())).findFirst();
+ Optional<ShardingSphereUser> user =
metaDataContexts.getAuthentication().getAuthentication().keySet().stream().filter(t
-> t.getGrantee().equals(entry.getKey().getGrantee())).findFirst();
if (user.isPresent() && null != result.get(entry.getKey())) {
metaDataContexts.getAuthentication().getAuthentication().put(user.get(),
entry.getValue());
} else if (!user.isPresent() && null !=
result.get(entry.getKey())) {