You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2017/04/18 13:29:27 UTC
[1/2] brooklyn-server git commit: Fix address publish bug
Repository: brooklyn-server
Updated Branches:
refs/heads/master d407e5e52 -> 26e5fe2ad
Fix address publish bug
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f3fa6005
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f3fa6005
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f3fa6005
Branch: refs/heads/master
Commit: f3fa60050c83ee661d4f1d96dcf4298e481408d7
Parents: d407e5e
Author: Duncan Godwin <du...@cloudsoftcorp.com>
Authored: Tue Apr 18 11:44:54 2017 +0100
Committer: Duncan Godwin <du...@cloudsoftcorp.com>
Committed: Tue Apr 18 11:44:54 2017 +0100
----------------------------------------------------------------------
.../location/jclouds/DefaultConnectivityResolver.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f3fa6005/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolver.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolver.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolver.java
index c4f8fe8..29fe5a8 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolver.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolver.java
@@ -256,12 +256,8 @@ public class DefaultConnectivityResolver extends BasicConfigurableObject impleme
}
void publishNetworks(NodeMetadata node, Entity entity) {
- if (entity.sensors().get(PRIVATE_ADDRESSES) == null) {
- entity.sensors().set(PRIVATE_ADDRESSES, ImmutableSet.copyOf(node.getPrivateAddresses()));
- }
- if (entity.sensors().get(PUBLIC_ADDRESSES) == null) {
- entity.sensors().set(PUBLIC_ADDRESSES, ImmutableSet.copyOf(node.getPublicAddresses()));
- }
+ entity.sensors().set(PRIVATE_ADDRESSES, ImmutableSet.copyOf(node.getPrivateAddresses()));
+ entity.sensors().set(PUBLIC_ADDRESSES, ImmutableSet.copyOf(node.getPublicAddresses()));
}
// --------------------------------------------------------------------------------------
[2/2] brooklyn-server git commit: This closes #640
Posted by al...@apache.org.
This closes #640
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/26e5fe2a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/26e5fe2a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/26e5fe2a
Branch: refs/heads/master
Commit: 26e5fe2add05aeec2c63badf88d32cd7254d0eef
Parents: d407e5e f3fa600
Author: Aled Sage <al...@gmail.com>
Authored: Tue Apr 18 14:29:18 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Apr 18 14:29:18 2017 +0100
----------------------------------------------------------------------
.../location/jclouds/DefaultConnectivityResolver.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------