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 A753C200C85 for ; Sat, 22 Apr 2017 00:55:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A5C81160B97; Fri, 21 Apr 2017 22:55:23 +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 E2539160BB6 for ; Sat, 22 Apr 2017 00:55:22 +0200 (CEST) Received: (qmail 49748 invoked by uid 500); 21 Apr 2017 22:55:22 -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 49297 invoked by uid 99); 21 Apr 2017 22:55: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; Fri, 21 Apr 2017 22:55:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A064EF4A22; Fri, 21 Apr 2017 22:55: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: Fri, 21 Apr 2017 22:55:29 -0000 Message-Id: In-Reply-To: <9b085cf2e76f4919908bcc60c564e3fc@git.apache.org> References: <9b085cf2e76f4919908bcc60c564e3fc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/39] brooklyn-server git commit: Fix testRebindWithCatalogAndApp with mode == REPLACE_CATALOG_WITH_NEWER_VERSION. archived-at: Fri, 21 Apr 2017 22:55:23 -0000 Fix testRebindWithCatalogAndApp with mode == REPLACE_CATALOG_WITH_NEWER_VERSION. Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b5ca71b9 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/b5ca71b9 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/b5ca71b9 Branch: refs/heads/master Commit: b5ca71b9dbbb6897abf6ab74bbd570b39f22649b Parents: 0bb7eb4 Author: Geoff Macartney Authored: Thu Sep 29 18:15:16 2016 +0100 Committer: Geoff Macartney Committed: Thu Apr 20 11:20:35 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b5ca71b9/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java index dc47c2d..a37d7ce 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java @@ -950,7 +950,7 @@ public abstract class RebindIteration { findCatalogIdsInReboundCatalog(bType, catalogItemIds, contextSuchAsId, idsFromReboundCatalog); if (idsFromReboundCatalog.size() == catalogItemIds.size()) { BrooklynClassLoadingContext loader = CatalogUtils.newClassLoadingContextForCatalogItems(managementContext, idsFromReboundCatalog); - return new LoadedClass(loader.loadClass(jType, bType), catalogItemIds); + return new LoadedClass(loader.loadClass(jType, bType), idsFromReboundCatalog); } else { LOG.warn("Unable to load all catalog items "+ Iterables.toString(catalogItemIds) +" for "+contextSuchAsId +" ("+bType.getSimpleName()+"); will try default class loader");