Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 05BFE200D1B for ; Thu, 12 Oct 2017 11:41:20 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 04679160BE5; Thu, 12 Oct 2017 09:41:20 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 77F8D160BE4 for ; Thu, 12 Oct 2017 11:41:19 +0200 (CEST) Received: (qmail 57112 invoked by uid 500); 12 Oct 2017 09:41:18 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 57102 invoked by uid 99); 12 Oct 2017 09:41:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Oct 2017 09:41:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 44BBEDFB0E; Thu, 12 Oct 2017 09:41:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.apache.org Date: Thu, 12 Oct 2017 09:41:20 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] brooklyn-server git commit: This closes #860 archived-at: Thu, 12 Oct 2017 09:41:20 -0000 This closes #860 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/fede005e Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/fede005e Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/fede005e Branch: refs/heads/master Commit: fede005e1d359a9e66eba5dfe9882d50d55ff19b Parents: 84e9e19 de71fd4 Author: Alex Heneveld Authored: Thu Oct 12 10:41:01 2017 +0100 Committer: Alex Heneveld Committed: Thu Oct 12 10:41:01 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/core/entity/AbstractEntity.java | 74 +++++++----- .../brooklyn/core/entity/EntityInternal.java | 3 +- .../mgmt/internal/LocalSubscriptionManager.java | 9 ++ .../brooklyn/core/sensor/AttributeMap.java | 119 ++++++++++++++----- .../entity/group/AbstractGroupImpl.java | 13 +- .../brooklyn/core/entity/AttributeMapTest.java | 5 +- .../apache/brooklyn/util/concurrent/Locks.java | 47 ++++++++ .../brooklyn/util/collections/LocksTest.java | 37 ++++++ 8 files changed, 237 insertions(+), 70 deletions(-) ----------------------------------------------------------------------