brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [10/39] brooklyn-server git commit: Fix testRebindWithCatalogAndApp with mode == REPLACE_CATALOG_WITH_NEWER_VERSION.
Date Fri, 21 Apr 2017 22:55:29 GMT
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 <geoff.macartney@cloudsoftcorp.com>
Authored: Thu Sep 29 18:15:16 2016 +0100
Committer: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
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<T>(loader.loadClass(jType, bType), catalogItemIds);
+                    return new LoadedClass<T>(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");


Mime
View raw message