Repository: brooklyn-server Updated Branches: refs/heads/master f66d1ad44 -> 6727aa620
Fix check for SL VLAN settings Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/6727aa62 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/6727aa62 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/6727aa62 Branch: refs/heads/master Commit: 6727aa6209fdc8e91bd1e309f7efefd7eb1a12d6 Parents: f66d1ad Author: Andrew Donald Kennedy <andrew.kenn...@cloudsoftcorp.com> Authored: Mon Mar 28 12:10:09 2016 +0100 Committer: Andrew Donald Kennedy <andrew.kenn...@cloudsoftcorp.com> Committed: Mon Mar 28 12:10:09 2016 +0100 ---------------------------------------------------------------------- .../jclouds/softlayer/SoftLayerSameVlanLocationCustomizer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6727aa62/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/softlayer/SoftLayerSameVlanLocationCustomizer.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/softlayer/SoftLayerSameVlanLocationCustomizer.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/softlayer/SoftLayerSameVlanLocationCustomizer.java index d8af21a..5158a0c 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/softlayer/SoftLayerSameVlanLocationCustomizer.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/softlayer/SoftLayerSameVlanLocationCustomizer.java @@ -163,7 +163,7 @@ public class SoftLayerSameVlanLocationCustomizer extends BasicJcloudsLocationCus LOG.debug("Looking up saved VLAN details {}", scopeUid); publicVlanId = lookupPublicVlanId(location, scopeUid); privateVlanId = lookupPrivateVlanId(location, scopeUid); - if (publicVlanId==null && privateVlanId!=null) { + if (publicVlanId != null && privateVlanId != null) { saveVlanTemplateOptions(scopeUid, softLayerOptions, publicVlanId, privateVlanId); return; }
