Skip to content
Snippets Groups Projects
Commit f899ef7d authored by Johannes Mey's avatar Johannes Mey
Browse files

do not send empty storage configuration groups

parent 0e3cc61b
No related branches found
No related tags found
No related merge requests found
......@@ -238,10 +238,12 @@ public class ERISConnector {
for (String path : partitionStorageConfigAttributes.keySet()) {
boolean configChanged = false;
JSONArray storageConfigurationGroups = new JSONArray();
// for each living partition
for (List<String> accessPathList : partitionStorageConfigAttributes.get(path).keySet()) {
boolean configChanged = false;
for (String attributeId : partitionStorageConfigAttributes.get(path).get(accessPathList)) {
if (attributeId.equals(""))
continue;
......@@ -260,13 +262,18 @@ public class ERISConnector {
}
jsonArrayAttributes.put(attribute);
jsonGroup.put("attributes", jsonArrayAttributes);
if (!jsonArrayAttributes.isEmpty() && configChanged) {
if (!jsonArrayAttributes.isEmpty()) {
storageConfigurationGroups.put(jsonGroup);
}
}
}
result.put("storageConfigurationGroups", storageConfigurationGroups);
if (storageConfigurationGroups.isEmpty() || !configChanged) {
logger.info("Not sending empty storage configuration groups. Config changed: {}, result {}", configChanged, result);
} else {
// send result
logger.info("Sending result: {}", result);
if (path.equals("Config/Linkage/"))
......@@ -290,6 +297,9 @@ public class ERISConnector {
logger.error("Getting living partition failed: {}", e.getMessage());
throw new RuntimeException(e);
}
}
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment