Repository: aurora Updated Branches: refs/heads/master 0650b8d1f -> 7d57cf4d7
Making OfferManager.getOffers() return a new set rather than a view Bugs closed: AURORA-1615 Reviewed at https://reviews.apache.org/r/43503/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/7d57cf4d Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/7d57cf4d Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/7d57cf4d Branch: refs/heads/master Commit: 7d57cf4d76a1f4963732195451dc8e1c6603e39e Parents: 0650b8d Author: Maxim Khutornenko <[email protected]> Authored: Thu Feb 11 17:31:12 2016 -0800 Committer: Maxim Khutornenko <[email protected]> Committed: Thu Feb 11 17:31:12 2016 -0800 ---------------------------------------------------------------------- .../java/org/apache/aurora/scheduler/offers/OfferManager.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/7d57cf4d/src/main/java/org/apache/aurora/scheduler/offers/OfferManager.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/offers/OfferManager.java b/src/main/java/org/apache/aurora/scheduler/offers/OfferManager.java index 394d25f..452451f 100644 --- a/src/main/java/org/apache/aurora/scheduler/offers/OfferManager.java +++ b/src/main/java/org/apache/aurora/scheduler/offers/OfferManager.java @@ -27,6 +27,7 @@ import com.google.common.base.Optional; import com.google.common.base.Supplier; import com.google.common.collect.FluentIterable; import com.google.common.collect.HashMultimap; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; @@ -222,7 +223,7 @@ public interface OfferManager extends EventSubscriber { @Override public Iterable<HostOffer> getOffers() { - return hostOffers.getWeaklyConsistentOffers(); + return hostOffers.getOffers(); } @Override @@ -321,8 +322,8 @@ public interface OfferManager extends EventSubscriber { } } - synchronized Iterable<HostOffer> getWeaklyConsistentOffers() { - return Iterables.unmodifiableIterable(offers); + synchronized Iterable<HostOffer> getOffers() { + return ImmutableSet.copyOf(offers); } synchronized Iterable<HostOffer> getWeaklyConsistentOffers(TaskGroupKey groupKey) {
