diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalConfigService.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalConfigService.java index 269e76c0c0675db9af9f29f2ca86cc84c0032ded..1fd3066f6263d1b0c7cb649d8166cebca2d7fbe3 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalConfigService.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalConfigService.java @@ -189,23 +189,24 @@ public class PortalConfigService { changeSets.addCreateItem(buildItem(namespaceId, ++maxLineNum, sourceItem)); - } else if (isModified(sourceValue, targetItem.getValue(), sourceComment, targetItem.getComment())) {//modified items + } else if (isModified(sourceValue, targetItem.getValue(), sourceComment, + targetItem.getComment())) {//modified items targetItem.setValue(sourceValue); targetItem.setComment(sourceComment); changeSets.addUpdateItem(targetItem); } } - } - //parse deleted items - List deletedItems = new LinkedList<>(); - Map sourceItemMap = BeanUtils.mapByKey("key", sourceItems); - for (ItemDTO targetItem: targetItems){ - if (sourceItemMap.get(targetItem.getKey()) == null){ - deletedItems.add(targetItem); + //parse deleted items + List deletedItems = new LinkedList<>(); + Map sourceItemMap = BeanUtils.mapByKey("key", sourceItems); + for (ItemDTO item : targetItems) { + if (sourceItemMap.get(item.getKey()) == null) { + deletedItems.add(item); + } } + changeSets.setDeleteItems(deletedItems); } - changeSets.setDeleteItems(deletedItems); return changeSets; }