Return-Path: 
 <commits-return-11747-apmail-brooklyn-commits-archive=brooklyn.apache.org@brooklyn.apache.org>
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 00475181CC
	for <apmail-brooklyn-commits-archive@minotaur.apache.org>;
 Mon,  1 Feb 2016 17:46:26 +0000 (UTC)
Received: (qmail 39551 invoked by uid 500); 1 Feb 2016 17:46:20 -0000
Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org
Received: (qmail 39494 invoked by uid 500); 1 Feb 2016 17:46:20 -0000
Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@brooklyn.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@brooklyn.apache.org>
List-Post: <mailto:commits@brooklyn.apache.org>
List-Id: <commits.brooklyn.apache.org>
Reply-To: dev@brooklyn.apache.org
Delivered-To: mailing list commits@brooklyn.apache.org
Received: (qmail 38175 invoked by uid 99); 1 Feb 2016 17:46:20 -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; Mon, 01 Feb 2016 17:46:20 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 1BCB4E03BE; Mon,  1 Feb 2016 17:46:20 +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: Mon, 01 Feb 2016 17:47:07 -0000
Message-Id: <2bf45777dc96451284818322b1180034@git.apache.org>
In-Reply-To: <9bc8945a1b59456ea209adbade6c40f8@git.apache.org>
References: <9bc8945a1b59456ea209adbade6c40f8@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [49/50] brooklyn-library git commit: AbstractController: use
 PORT_NUMBER_SENSOR config

AbstractController: use PORT_NUMBER_SENSOR config

- Previously, it hard-coded HTTP_PORT rather than using
  key specified in the configuration


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/929ee88c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/929ee88c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/929ee88c

Branch: refs/heads/0.5.0
Commit: 929ee88c559c2696f48e681d75824c8f62be5640
Parents: 0d9ee80
Author: Aled Sage <aled.sage@gmail.com>
Authored: Wed Apr 17 14:41:12 2013 +0100
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Thu Apr 25 11:24:49 2013 +0100

----------------------------------------------------------------------
 .../main/java/brooklyn/entity/proxy/AbstractControllerImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/929ee88c/software/webapp/src/main/java/brooklyn/entity/proxy/AbstractControllerImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/proxy/AbstractControllerImpl.java b/software/webapp/src/main/java/brooklyn/entity/proxy/AbstractControllerImpl.java
index 4585013..609cfed 100644
--- a/software/webapp/src/main/java/brooklyn/entity/proxy/AbstractControllerImpl.java
+++ b/software/webapp/src/main/java/brooklyn/entity/proxy/AbstractControllerImpl.java
@@ -150,7 +150,7 @@ public abstract class AbstractControllerImpl extends SoftwareProcessImpl impleme
     }
 
     @Override
-    public AttributeSensor getPortNumberSensor() {
+    public AttributeSensor<Integer> getPortNumberSensor() {
         return getAttribute(PORT_NUMBER_SENSOR);
     }
 
@@ -336,7 +336,7 @@ public abstract class AbstractControllerImpl extends SoftwareProcessImpl impleme
     
     protected String getAddressOfEntity(Entity member) {
         String ip = member.getAttribute(Attributes.HOSTNAME);
-        Integer port = member.getAttribute(Attributes.HTTP_PORT);
+        Integer port = member.getAttribute(getPortNumberSensor());
         if (ip!=null && port!=null) {
             return ip+":"+port;
         }