You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2017/04/21 22:55:52 UTC

[33/39] brooklyn-server git commit: Warning on primaries not needed.

Warning on primaries not needed.

It's perfectly possible for the catalog item loader to have just the launcher management context in the secondaries.


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/daaf0398
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/daaf0398
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/daaf0398

Branch: refs/heads/master
Commit: daaf03989346ad67cdae3ed7256c8dad53add57a
Parents: 759abe5
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Wed Oct 5 11:02:20 2016 +0100
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Thu Apr 20 11:20:36 2017 +0100

----------------------------------------------------------------------
 .../org/apache/brooklyn/core/catalog/internal/CatalogUtils.java | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/daaf0398/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java
index 8524455..ff393b3 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java
@@ -341,11 +341,6 @@ public class CatalogUtils {
         for (String catalogItemId : catalogItemIds) {
             addCatalogItemContext(managementContext, seqLoader, catalogItemId);
         }
-        // TODO what if not all items were found? need to consider what the right behaviour is.
-        // TODO for now take the course of using whatever items we *did* find
-        if (seqLoader.getPrimaries().size() != catalogItemIds.size()) {
-            log.warn("Couldn't find all catalog items  used for instantiating entity " + managementContext);
-        }
         return seqLoader;
     }