Repository: brooklyn-library Updated Branches: refs/heads/master 65fb69694 -> 8a239404b
AbstractControllerImpl: minor tidies Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/3bdd17e3 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/3bdd17e3 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/3bdd17e3 Branch: refs/heads/master Commit: 3bdd17e3b70a30278a897496b0aab10f6f894ffb Parents: 65fb696 Author: Aled Sage <aled.s...@gmail.com> Authored: Fri Feb 19 19:36:05 2016 +0000 Committer: Aled Sage <aled.s...@gmail.com> Committed: Fri Mar 11 17:51:55 2016 +0000 ---------------------------------------------------------------------- .../org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/3bdd17e3/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java index 5c4c443..47ef7a9 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java @@ -80,7 +80,6 @@ public abstract class AbstractControllerImpl extends SoftwareProcessImpl impleme protected AbstractMembershipTrackingPolicy serverPoolMemberTrackerPolicy; // final because this is the synch target final protected Set<String> serverPoolAddresses = Sets.newLinkedHashSet(); - protected Map<Entity,String> serverPoolTargets = Maps.newLinkedHashMap(); public AbstractControllerImpl() { this(MutableMap.of(), null, null); @@ -150,7 +149,7 @@ public abstract class AbstractControllerImpl extends SoftwareProcessImpl impleme // but synch in case invoked at other times; and note if !isActive during start means we miss some after this, // we will update again on postStart after setting isActive=true Map<Entity,String> serverPoolTargets = Maps.newLinkedHashMap(); - for (Entity member : getServerPool().getMembers()) { + for (Entity member : serverPool.getMembers()) { if (belongsInServerPool(member)) { if (LOG.isTraceEnabled()) LOG.trace("Done {} checkEntity {}", this, member); String address = getAddressOfEntity(member);
