Return-Path: 
 <dev-return-7375-apmail-brooklyn-dev-archive=brooklyn.apache.org@brooklyn.incubator.apache.org>
X-Original-To: apmail-brooklyn-dev-archive@minotaur.apache.org
Delivered-To: apmail-brooklyn-dev-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 6FDA2177E9
	for <apmail-brooklyn-dev-archive@minotaur.apache.org>;
 Wed, 20 May 2015 12:52:58 +0000 (UTC)
Received: (qmail 45806 invoked by uid 500); 20 May 2015 12:52:58 -0000
Delivered-To: apmail-brooklyn-dev-archive@brooklyn.apache.org
Received: (qmail 45774 invoked by uid 500); 20 May 2015 12:52:58 -0000
Mailing-List: contact dev-help@brooklyn.incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@brooklyn.incubator.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@brooklyn.incubator.apache.org>
List-Post: <mailto:dev@brooklyn.incubator.apache.org>
List-Id: <dev.brooklyn.incubator.apache.org>
Reply-To: dev@brooklyn.incubator.apache.org
Delivered-To: mailing list dev@brooklyn.incubator.apache.org
Received: (qmail 45763 invoked by uid 99); 20 May 2015 12:52:58 -0000
Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 May 2015 12:52:58 +0000
Received: from localhost (localhost [127.0.0.1])
	by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org)
 with ESMTP id ABE67182753
	for <dev@brooklyn.apache.org>; Wed, 20 May 2015 12:52:57 +0000 (UTC)
X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org
X-Spam-Flag: NO
X-Spam-Score: -0.029
X-Spam-Level: 
X-Spam-Status: No, score=-0.029 tagged_above=-999 required=6.31
	tests=[RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01,
	T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled
Received: from mx1-us-west.apache.org ([10.40.0.8])
	by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new,
 port 10024)
	with ESMTP id 7g3fUHc8gP1e for <dev@brooklyn.apache.org>;
	Wed, 20 May 2015 12:52:53 +0000 (UTC)
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with
 SMTP id CC9AE24BB6
	for <dev@brooklyn.incubator.apache.org>;
 Wed, 20 May 2015 12:52:52 +0000 (UTC)
Received: (qmail 45759 invoked by uid 99); 20 May 2015 12:52:52 -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; Wed, 20 May 2015 12:52:52 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 6943ADFAFF; Wed, 20 May 2015 12:52:52 +0000 (UTC)
From: neykov <git@git.apache.org>
To: dev@brooklyn.incubator.apache.org
Reply-To: dev@brooklyn.incubator.apache.org
References: <git-pr-617-incubator-brooklyn@git.apache.org>
In-Reply-To: <git-pr-617-incubator-brooklyn@git.apache.org>
Subject: [GitHub] incubator-brooklyn pull request: CLI commands for
 manipulating cat...
Content-Type: text/plain
Message-Id: <20150520125252.6943ADFAFF@git1-us-west.apache.org>
Date: Wed, 20 May 2015 12:52:52 +0000 (UTC)

Github user neykov commented on a diff in the pull request:

    https://github.com/apache/incubator-brooklyn/pull/617#discussion_r30697461
  
    --- Diff: core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java ---
    @@ -750,7 +780,37 @@ private String setFromItemIfUnset(String oldValue, Map<?,?> item, String fieldAt
             return oldValue;
         }
     
    +    private Collection<CatalogItemDtoAbstract<?, ?>> scanAnnotationsFromLocal(ManagementContext mgmt) {
    +        CatalogDto dto = CatalogDto.newNamedInstance("Local Scanned Catalog", "All annotated Brooklyn entities detected in the classpath", "scanning-local-classpath");
    +        return scanAnnotationsInternal(mgmt, new CatalogDo(dto));
    +    }
         
    +    private Collection<CatalogItemDtoAbstract<?, ?>> scanAnnotationsFromBundles(ManagementContext mgmt, Collection<CatalogBundle> libraries) {
    +        String[] urls = null;
    +        CatalogDto dto = CatalogDto.newNamedInstance("Bundles Scanned Catalog", "All annotated Brooklyn entities detected in the classpath", "scanning-bundles-classpath-"+libraries.hashCode());
    +        urls = new String[libraries.size()];
    +        int i=0;
    +        for (CatalogBundle b: libraries)
    +            urls[i++] = b.getUrl();
    +            
    +        CatalogDo subCatalog = new CatalogDo(dto);
    +        subCatalog.addToClasspath(urls);
    --- End diff --
    
    I see that below you are handling the `null` case, but then if all libraries are name-value pairs, the code path will go in the "scanning catalog root classpath" case. Better move the null check here.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---