Skip to content

Commit 2eef7aa

Browse files
shwstpprDaan Hoogland
authored andcommitted
adding default deny keys also when there are no other keys
1 parent a127a26 commit 2eef7aa

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,14 +1663,14 @@ public Extension getExtensionForCluster(long clusterId) {
16631663
public List<String> getExtensionReservedResourceDetails(long extensionId) {
16641664
ExtensionDetailsVO detailsVO = extensionDetailsDao.findDetail(extensionId,
16651665
ApiConstants.RESERVED_RESOURCE_DETAILS);
1666-
if (detailsVO == null || !StringUtils.isNotBlank(detailsVO.getValue())) {
1667-
return Collections.emptyList();
1668-
}
16691666
List<String> reservedDetails = new ArrayList<>();
1670-
String[] parts = detailsVO.getValue().split(",");
1671-
for (String part : parts) {
1672-
if (StringUtils.isNotBlank(part)) {
1673-
reservedDetails.add(part.trim());
1667+
if (detailsVO != null && StringUtils.isNotBlank(detailsVO.getValue())) {
1668+
String[] parts = detailsVO.getValue().split(",");
1669+
for (String part : parts) {
1670+
String trimmedPart = part.trim();
1671+
if (StringUtils.isNotBlank(trimmedPart)) {
1672+
reservedDetails.add(trimmedPart);
1673+
}
16741674
}
16751675
}
16761676
addInbuiltExtensionReservedResourceDetails(extensionId, reservedDetails);

0 commit comments

Comments
 (0)