root
/
nacos
mirror of https://github.com/alibaba/nacos.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix NPE problem when update instance metadata with null value. (#13628)
Code Coverage / ci (17, ubuntu-latest) (push) Has been cancelled Details
PUSH-CI / Build dist tar (push) Has been cancelled Details
PUSH-CI / Docker images (centos, 17) (push) Has been cancelled Details
PUSH-CI / Deploy nacos (push) Has been cancelled Details
PUSH-CI / Java e2e Test (push) Has been cancelled Details
PUSH-CI / GO E2E Test (push) Has been cancelled Details
PUSH-CI / Cpp E2E Test (push) Has been cancelled Details
PUSH-CI / Csharp E2E Test (push) Has been cancelled Details
PUSH-CI / Nodejs E2E Test (push) Has been cancelled Details
PUSH-CI / Python E2E Test (push) Has been cancelled Details
PUSH-CI / Clean (push) Has been cancelled Details

This commit is contained in:
杨翊 SionYang 2025-07-22 19:10:21 +08:00 committed by GitHub
parent 00e579e765
commit c4b7ce881f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
naming/src/main/java/com/alibaba/nacos/naming/core/InstanceOperatorClientImpl.java
View File

@ -62,6 +62,7 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors;
/** /**
* Instance service. * Instance service.
@ -144,10 +145,15 @@ public class InstanceOperatorClientImpl implements InstanceOperator {
InstanceMetadata result = new InstanceMetadata(); InstanceMetadata result = new InstanceMetadata();
result.setEnabled(instance.isEnabled()); result.setEnabled(instance.isEnabled());
result.setWeight(instance.getWeight()); result.setWeight(instance.getWeight());
result.getExtendData().putAll(instance.getMetadata()); result.getExtendData().putAll(filterNullValue(instance.getMetadata()));
return result; return result;
} }
private Map<String, String> filterNullValue(Map<String, String> metadata) {
return metadata.entrySet().stream().filter(entry -> entry.getValue() != null)
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
}
@Override @Override
public void patchInstance(String namespaceId, String groupName, String serviceName, InstancePatchObject patchObject) public void patchInstance(String namespaceId, String groupName, String serviceName, InstancePatchObject patchObject)
throws NacosException { throws NacosException {

11
naming/src/test/java/com/alibaba/nacos/naming/core/InstanceOperatorClientImplTest.java
View File

@ -164,6 +164,17 @@ class InstanceOperatorClientImplTest {
Mockito.verify(metadataOperateService).updateInstanceMetadata(Mockito.any(), Mockito.any(), Mockito.any()); Mockito.verify(metadataOperateService).updateInstanceMetadata(Mockito.any(), Mockito.any(), Mockito.any());
} }
@Test
void testUpdateInstanceWithNullValue() throws NacosException {
Instance instance = new Instance();
instance.setServiceName("C");
instance.getMetadata().put("nullValue", null);
instanceOperatorClient.updateInstance("A", Constants.DEFAULT_GROUP, "C", instance);
Mockito.verify(metadataOperateService).updateInstanceMetadata(Mockito.any(), Mockito.any(),
Mockito.argThat(argument -> argument.getExtendData().isEmpty()));
}
@Test @Test
void testPatchInstance() throws NacosException { void testPatchInstance() throws NacosException {
Instance instance = new Instance(); Instance instance = new Instance();