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 45DEF200C68 for ; Wed, 3 May 2017 12:01:14 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 44A63160BC7; Wed, 3 May 2017 10:01:14 +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 939AC160BBC for ; Wed, 3 May 2017 12:01:13 +0200 (CEST) Received: (qmail 30037 invoked by uid 500); 3 May 2017 10:01:12 -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 29984 invoked by uid 99); 3 May 2017 10:01:12 -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; Wed, 03 May 2017 10:01:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 829D5DF9A3; Wed, 3 May 2017 10:01:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: drigodwin@apache.org To: commits@brooklyn.apache.org Date: Wed, 03 May 2017 10:01:13 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/5] brooklyn-server git commit: fix bug where entity's search path isn't used when retrieving icon url's archived-at: Wed, 03 May 2017 10:01:14 -0000 fix bug where entity's search path isn't used when retrieving icon url's Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/00d87890 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/00d87890 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/00d87890 Branch: refs/heads/master Commit: 00d8789040bc4d67b2e787de81b3b8209e888c3a Parents: 8a6fc6e Author: Alex Heneveld Authored: Fri Apr 28 15:55:42 2017 +0100 Committer: Alex Heneveld Committed: Tue May 2 11:43:47 2017 +0100 ---------------------------------------------------------------------- .../org/apache/brooklyn/rest/resources/EntityResource.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/00d87890/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java ---------------------------------------------------------------------- diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java index 1ebaad7..efc8838 100644 --- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java +++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java @@ -21,6 +21,7 @@ package org.apache.brooklyn.rest.resources; import static javax.ws.rs.core.Response.created; import static javax.ws.rs.core.Response.status; import static javax.ws.rs.core.Response.Status.ACCEPTED; +import static org.apache.brooklyn.rest.util.WebResourceUtils.serviceAbsoluteUriBuilder; import java.net.URI; import java.util.LinkedList; @@ -45,6 +46,7 @@ import org.apache.brooklyn.core.mgmt.EntityManagementUtils; import org.apache.brooklyn.core.mgmt.EntityManagementUtils.CreationResult; import org.apache.brooklyn.core.mgmt.entitlement.EntitlementPredicates; import org.apache.brooklyn.core.mgmt.entitlement.Entitlements; +import org.apache.brooklyn.core.typereg.RegisteredTypes; import org.apache.brooklyn.rest.api.EntityApi; import org.apache.brooklyn.rest.domain.EntitySummary; import org.apache.brooklyn.rest.domain.LocationSummary; @@ -66,11 +68,11 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.io.Files; -import static org.apache.brooklyn.rest.util.WebResourceUtils.serviceAbsoluteUriBuilder; @HaHotStateRequired public class EntityResource extends AbstractBrooklynRestResource implements EntityApi { + @SuppressWarnings("unused") private static final Logger log = LoggerFactory.getLogger(EntityResource.class); @Context @@ -162,7 +164,7 @@ public class EntityResource extends AbstractBrooklynRestResource implements Enti // paths (ie non-protocol) and // NB, for security, file URL's are NOT served MediaType mime = WebResourceUtils.getImageMediaTypeFromExtension(Files.getFileExtension(url)); - Object content = ResourceUtils.create(brooklyn().getCatalogClassLoader()).getResourceFromUrl(url); + Object content = ResourceUtils.create(entity).getResourceFromUrl(url); return Response.ok(content, mime).build(); }