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 7F1CE200CCB for ; Thu, 20 Jul 2017 11:17:38 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7C22616AEAE; Thu, 20 Jul 2017 09:17:38 +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 C1D6216AEAF for ; Thu, 20 Jul 2017 11:17:37 +0200 (CEST) Received: (qmail 81637 invoked by uid 500); 20 Jul 2017 09:17:37 -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 81628 invoked by uid 99); 20 Jul 2017 09:17:36 -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, 20 Jul 2017 09:17:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 10291DF964; Thu, 20 Jul 2017 09:17:35 +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 Message-Id: <027a7d75229a435088d77e5cc72764c4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: brooklyn-server git commit: more debugging when plan is the same Date: Thu, 20 Jul 2017 09:17:35 +0000 (UTC) archived-at: Thu, 20 Jul 2017 09:17:38 -0000 Repository: brooklyn-server Updated Branches: refs/heads/master c02b3e355 -> 818016165 more debugging when plan is the same Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/81801616 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/81801616 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/81801616 Branch: refs/heads/master Commit: 8180161656d2fabd63527146a5caae47fc0722ff Parents: c02b3e3 Author: Alex Heneveld Authored: Thu Jul 20 10:17:19 2017 +0100 Committer: Alex Heneveld Committed: Thu Jul 20 10:17:19 2017 +0100 ---------------------------------------------------------------------- .../core/typereg/BasicBrooklynTypeRegistry.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/81801616/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java b/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java index f1a3e66..7097270 100644 --- a/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java +++ b/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java @@ -19,7 +19,6 @@ package org.apache.brooklyn.core.typereg; import java.util.Map; -import java.util.NoSuchElementException; import java.util.Objects; import java.util.Set; @@ -29,7 +28,6 @@ import org.apache.brooklyn.api.catalog.BrooklynCatalog; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.catalog.CatalogItem.CatalogItemType; import org.apache.brooklyn.api.internal.AbstractBrooklynObjectSpec; -import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.api.typereg.BrooklynTypeRegistry; import org.apache.brooklyn.api.typereg.RegisteredType; @@ -37,9 +35,7 @@ import org.apache.brooklyn.api.typereg.RegisteredType.TypeImplementationPlan; import org.apache.brooklyn.api.typereg.RegisteredTypeLoadingContext; import org.apache.brooklyn.core.catalog.internal.BasicBrooklynCatalog; import org.apache.brooklyn.core.catalog.internal.CatalogItemBuilder; -import org.apache.brooklyn.core.catalog.internal.CatalogItemDtoAbstract; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; -import org.apache.brooklyn.core.location.BasicLocationRegistry; import org.apache.brooklyn.core.mgmt.ha.OsgiManager; import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal; import org.apache.brooklyn.test.Asserts; @@ -385,8 +381,12 @@ public class BasicBrooklynTypeRegistry implements BrooklynTypeRegistry { // different bundles, either anonymous or same item in two named bundles if (!oldType.getPlan().equals(type.getPlan())) { // if plan is different, fail - throw new IllegalStateException("Cannot add "+type+" in "+type.getContainingBundle()+" to catalog; different plan in "+oldType+" from bundle "+ - oldType.getContainingBundle()+" is already present"); + String msg = "Cannot add "+type+" in "+type.getContainingBundle()+" to catalog; different plan in "+oldType+" from bundle "+ + oldType.getContainingBundle()+" is already present (throwing)"; + log.debug(msg+"\n"+ + "Plan from "+type.getContainingBundle()+" is:\n"+type.getPlan()+"\n"+ + "Plan from "+oldType.getContainingBundle()+" is:\n"+oldType.getPlan() ); + throw new IllegalStateException(msg); } if (oldType.getKind()!=RegisteredTypeKind.UNRESOLVED && type.getKind()!=RegisteredTypeKind.UNRESOLVED && !Objects.equals(oldType.getKind(), type.getKind())) {