Return-Path: <dev-return-18613-archive-asf-public=cust-asf.ponee.io@brooklyn.apache.org>
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 EBDC5200B83
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Fri,  2 Sep 2016 19:43:30 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id EA7C0160AAE; Fri,  2 Sep 2016 17:43:30 +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 6D5FF160A8C
	for <archive-asf-public@cust-asf.ponee.io>; Fri,  2 Sep 2016 19:43:30 +0200 (CEST)
Received: (qmail 68873 invoked by uid 500); 2 Sep 2016 17:43:20 -0000
Mailing-List: contact dev-help@brooklyn.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@brooklyn.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@brooklyn.apache.org>
List-Post: <mailto:dev@brooklyn.apache.org>
List-Id: <dev.brooklyn.apache.org>
Reply-To: dev@brooklyn.apache.org
Delivered-To: mailing list dev@brooklyn.apache.org
Received: (qmail 68738 invoked by uid 99); 2 Sep 2016 17:43:19 -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; Fri, 02 Sep 2016 17:43:19 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 4A10EE0579; Fri,  2 Sep 2016 17:43:16 +0000 (UTC)
From: ygy <git@git.apache.org>
To: dev@brooklyn.apache.org
Reply-To: dev@brooklyn.apache.org
References: <git-pr-285-brooklyn-server@git.apache.org>
In-Reply-To: <git-pr-285-brooklyn-server@git.apache.org>
Subject: [GitHub] brooklyn-server pull request #285: Adding HttpExecutor to be used for interc...
Content-Type: text/plain
Message-Id: <20160902174316.4A10EE0579@git1-us-west.apache.org>
Date: Fri,  2 Sep 2016 17:43:16 +0000 (UTC)
archived-at: Fri, 02 Sep 2016 17:43:31 -0000

Github user ygy commented on a diff in the pull request:

    https://github.com/apache/brooklyn-server/pull/285#discussion_r77385034
  
    --- Diff: core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java ---
    @@ -275,7 +294,23 @@ public HttpFeed() {
         protected HttpFeed(Builder builder) {
             setConfig(ONLY_IF_SERVICE_UP, builder.onlyIfServiceUp);
             Map<String,String> baseHeaders = ImmutableMap.copyOf(checkNotNull(builder.headers, "headers"));
    -        
    +
    +        HttpExecutor httpExecutor;
    +        if (builder.httpExecutor != null) {
    +            httpExecutor = builder.httpExecutor;
    +        } else {
    +            HttpExecutorFactory httpExecutorFactory = null;
    +            Collection<? extends Location> locations = Locations.getLocationsCheckingAncestors(builder.entity.getLocations(), builder.entity);
    +            Maybe<Location> location =  Machines.findUniqueElement(locations, Location.class);
    --- End diff --
    
    Addressed. `MachineLocation` is used to cover windows entities too.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---