Skip to content

Commit 9d08e17

Browse files
committed
Fix config compilation errs (after brooklyn deprecated code deletions)
1 parent ddd1b42 commit 9d08e17

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

cloudstack/src/main/java/brooklyn/networking/cloudstack/legacy/LegacyAbstractSubnetApp.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public abstract class LegacyAbstractSubnetApp extends AbstractApplication implem
6767
}
6868

6969
protected <T> void setIfNotAlreadySet(ConfigKey<T> key, T value) {
70-
if (getConfigMap().getConfigRaw(key, true).isAbsent()) configure(key, value);
70+
if (config().getRaw(key).isAbsent()) configure(key, value);
7171
}
7272

7373
protected void applyDefaultConfig() {
@@ -78,7 +78,7 @@ protected void applyDefaultConfig() {
7878
setIfNotAlreadySet(USE_VPC, false);
7979
setIfNotAlreadySet(USE_SUBNET, true);
8080
// FIXME not safe for persistence
81-
if (getConfigMap().getConfigRaw(LegacyJcloudsCloudstackSubnetLocation.PORT_FORWARDING_MANAGER, true).isAbsent()) {
81+
if (config().getRaw(LegacyJcloudsCloudstackSubnetLocation.PORT_FORWARDING_MANAGER).isAbsent()) {
8282
PortForwardManager pfm = (PortForwardManager) getManagementContext().getLocationRegistry().resolve("portForwardManager(scope=global)");
8383
configure(LegacyJcloudsCloudstackSubnetLocation.PORT_FORWARDING_MANAGER, pfm);
8484
}

cloudstack/src/main/java/brooklyn/networking/cloudstack/loadbalancer/CloudStackLoadBalancerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ protected String getAddressOfEntity(Entity member) {
198198
protected void startLoadBalancer() {
199199
String lbName = getAttribute(LOAD_BALANCER_NAME);
200200
if (Strings.isBlank(lbName)) {
201-
ConfigBag setup = ConfigBag.newInstance(getAllConfig());
201+
ConfigBag setup = ConfigBag.newInstanceCopying(config().getBag());
202202
lbName = new BasicCloudMachineNamer().generateNewGroupId(setup);
203203
sensors().set(LOAD_BALANCER_NAME, lbName);
204204
}

0 commit comments

Comments
 (0)