fix npe

apolloconfig · Nov 27, 2024 · 99cf8fd · 99cf8fd
1 parent d07862e
commit 99cf8fd
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigRepository.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigRepository.java
@@ -364,12 +364,14 @@ private List<ServiceDTO> getConfigServices() {
 
   private Map<String, String> mergeConfigurations(Map<String, String> configurations,List<ConfigurationChange> configurationChanges) {
     Map<String, String> newConfigurations = new HashMap<>();
-    if (configurationChanges == null) {
-      return newConfigurations;
-    }
     if(configurations!=null){
       Maps.newHashMap(configurations);
     }
+
+    if (configurationChanges == null) {
+      return newConfigurations;
+    }
+
     for (ConfigurationChange change : configurationChanges) {
       switch (change.getConfigurationChangeType()) {
         case ADDED: