brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [17/39] brooklyn-server git commit: Delete original change from 0ab9b37b55fce9eaf3eef319ea2fc77e41e7ba8e
Date Fri, 21 Apr 2017 22:55:36 GMT
Delete original change from 0ab9b37b55fce9eaf3eef319ea2fc77e41e7ba8e

https://github.com/apache/brooklyn-server/pull/338#discussion_r94621436

The change was done during the early investigation of the issue.
The nested-item tests work without it.


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

Branch: refs/heads/master
Commit: 584efcc4e5845c372d8519f3d073c938b9516ebe
Parents: 9369a42
Author: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Authored: Wed Feb 22 16:43:30 2017 +0000
Committer: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Committed: Thu Apr 20 11:20:36 2017 +0100

----------------------------------------------------------------------
 .../apache/brooklyn/core/catalog/internal/CatalogUtils.java  | 8 --------
 .../brooklyn/core/resolve/entity/JavaEntitySpecResolver.java | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/584efcc4/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 367d6ee..15aafd7 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
@@ -19,7 +19,6 @@
 package org.apache.brooklyn.core.catalog.internal;
 
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 
 import javax.annotation.Nullable;
@@ -173,13 +172,6 @@ public class CatalogUtils {
     public static String getCatalogItemIdFromLoader(BrooklynClassLoadingContext loader) {
         if (loader instanceof OsgiBrooklynClassLoadingContext) {
             return ((OsgiBrooklynClassLoadingContext)loader).getCatalogItemId();
-        } else if (loader instanceof BrooklynClassLoadingContextSequential) {
-            final Iterator<BrooklynClassLoadingContext> iterator = ((BrooklynClassLoadingContextSequential)
loader).getPrimaries().iterator();
-            if (iterator.hasNext()) {
-                BrooklynClassLoadingContext osgiLoader = iterator.next();
-                return getCatalogItemIdFromLoader(osgiLoader);
-            }
-            else return null;
         } else {
             return null;
         }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/584efcc4/core/src/main/java/org/apache/brooklyn/core/resolve/entity/JavaEntitySpecResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/resolve/entity/JavaEntitySpecResolver.java
b/core/src/main/java/org/apache/brooklyn/core/resolve/entity/JavaEntitySpecResolver.java
index 243f6b4..6657727 100644
--- a/core/src/main/java/org/apache/brooklyn/core/resolve/entity/JavaEntitySpecResolver.java
+++ b/core/src/main/java/org/apache/brooklyn/core/resolve/entity/JavaEntitySpecResolver.java
@@ -87,7 +87,7 @@ public class JavaEntitySpecResolver extends AbstractEntitySpecResolver{
                 .additionalInterfaces(additionalInterfaceClazzes);
             spec = rawSpec;
         }
-        spec.catalogItemId(CatalogUtils.getCatalogItemIdFromLoader(loader));
+        spec.stackCatalogItemId(CatalogUtils.getCatalogItemIdFromLoader(loader));
 
         return spec;
     }


Mime
View raw message