Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 17B821103F for ; Fri, 1 Aug 2014 22:03:32 +0000 (UTC) Received: (qmail 10049 invoked by uid 500); 1 Aug 2014 22:03:32 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 10027 invoked by uid 500); 1 Aug 2014 22:03:31 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 10015 invoked by uid 99); 1 Aug 2014 22:03:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Aug 2014 22:03:31 +0000 X-ASF-Spam-Status: No, hits=-2000.6 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 01 Aug 2014 22:03:33 +0000 Received: (qmail 9890 invoked by uid 99); 1 Aug 2014 22:03:07 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Aug 2014 22:03:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5C3B79BEA5E; Fri, 1 Aug 2014 22:03:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: fix access to now-inherited-private id field Date: Fri, 1 Aug 2014 22:03:07 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-brooklyn Updated Branches: refs/heads/master 8b5d48ac2 -> 547b0e00e fix access to now-inherited-private id field Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/547b0e00 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/547b0e00 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/547b0e00 Branch: refs/heads/master Commit: 547b0e00e6de4533da722aa8a8371abf0b154be5 Parents: 8b5d48a Author: Alex Heneveld Authored: Fri Aug 1 18:01:36 2014 -0400 Committer: Alex Heneveld Committed: Fri Aug 1 18:01:36 2014 -0400 ---------------------------------------------------------------------- .../src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/547b0e00/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java b/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java index bfccbec..9ca0e91 100644 --- a/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java +++ b/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java @@ -403,7 +403,7 @@ public abstract class AbstractEntityAdjunct extends AbstractBrooklynObject imple return Objects.toStringHelper(getClass()) .add("name", name) .add("running", isRunning()) - .add("id", id) + .add("id", getId()) .toString(); } }