Return-Path: <dev-return-27582-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 A4D0C200D3B
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Thu, 26 Oct 2017 12:18:40 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id A387C1609E8; Thu, 26 Oct 2017 10:18:40 +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 E9E3D160BF2
	for <archive-asf-public@cust-asf.ponee.io>; Thu, 26 Oct 2017 12:18:39 +0200 (CEST)
Received: (qmail 34170 invoked by uid 500); 26 Oct 2017 10:18:38 -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 34015 invoked by uid 99); 26 Oct 2017 10:18:38 -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, 26 Oct 2017 10:18:38 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id CDE78DF97F; Thu, 26 Oct 2017 10:18:35 +0000 (UTC)
From: aledsage <git@git.apache.org>
To: dev@brooklyn.apache.org
Reply-To: dev@brooklyn.apache.org
References: <git-pr-868-brooklyn-server@git.apache.org>
In-Reply-To: <git-pr-868-brooklyn-server@git.apache.org>
Subject: [GitHub] brooklyn-server pull request #868: allow types from different bundles if equ...
Content-Type: text/plain
Message-Id: <20171026101836.CDE78DF97F@git1-us-west.apache.org>
Date: Thu, 26 Oct 2017 10:18:35 +0000 (UTC)
archived-at: Thu, 26 Oct 2017 10:18:40 -0000

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

    https://github.com/apache/brooklyn-server/pull/868#discussion_r147079416
  
    --- Diff: core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java ---
    @@ -1492,7 +1503,7 @@ protected OsgiBundleInstallationResult addItemsOsgi(String yaml, boolean forceUp
     
             OsgiBundleInstallationResult result = null;
             try {
    -            result = osgiManager.get().install(null, new FileInputStream(bf), true, true, forceUpdate).get();
    +            result = osgiManager.get().install(new BasicManagedBundle(vn.getSymbolicName(), vn.getVersionString(), null), new FileInputStream(bf), true, true, forceUpdate).get();
    --- End diff --
    
    (Unrelated) Feels wrong that we pass into this method `Maybe<OsgiManager> osgiManager`, and then just call `osgiManager.get()` without checking it's present at all. Looking at its usage, the callers always check - so the method signature should be just `OsgiManager` instead of a maybe.


---