[ISSUE #12970] Fix NamingMetadataManager.removeInstanceMetadata() err…

…or (#12971) * [ISSUE #12970] Fix NamingMetadataManager.removeInstanceMetadata() error fix #12970 * Update NamingMetadataManagerTest.java
alibaba · Dec 18, 2024 · 762303b · 762303b
1 parent 0556181
commit 762303b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/v2/metadata/NamingMetadataManager.java b/naming/src/main/java/com/alibaba/nacos/naming/core/v2/metadata/NamingMetadataManager.java
@@ -151,7 +151,7 @@ public void removeInstanceMetadata(Service service, String metadataId) {
         if (null != instanceMetadataMapForService) {
             instanceMetadataMapForService.remove(metadataId);
             if (instanceMetadataMapForService.isEmpty()) {
-                serviceMetadataMap.remove(service);
+                instanceMetadataMap.remove(service);
             }
         }
         expiredMetadataInfos.remove(ExpiredMetadataInfo.newExpiredInstanceMetadata(service, metadataId));

diff --git a/...ng/src/test/java/com/alibaba/nacos/naming/core/v2/metadata/NamingMetadataManagerTest.java b/...ng/src/test/java/com/alibaba/nacos/naming/core/v2/metadata/NamingMetadataManagerTest.java
@@ -170,6 +170,10 @@ void testRemoveInstanceMetadata() {
         Optional<InstanceMetadata> instanceMetadata = namingMetadataManager.getInstanceMetadata(service, METADATA_ID);
 
         assertFalse(instanceMetadata.isPresent());
+
+        Map<Service, ConcurrentMap<String, InstanceMetadata>> instanceMetadataSnapshot = namingMetadataManager.getInstanceMetadataSnapshot();
+
+        assertEquals(0, instanceMetadataSnapshot.size());
     }
 
     @Test
@@ -233,4 +237,4 @@ void testOnEvent() {
         namingMetadataManager.onEvent(clientDisconnectEvent);
         Mockito.verify(clientDisconnectEvent).getClient();
     }
-}
+}