Return-Path: <commits-return-17916-archive-asf-public=cust-asf.ponee.io@brooklyn.apache.org>
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 F24D9200D63
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Thu, 21 Dec 2017 10:14:01 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id F0EE6160C2B; Thu, 21 Dec 2017 09:14:01 +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 424F6160C1A
	for <archive-asf-public@cust-asf.ponee.io>; Thu, 21 Dec 2017 10:14:01 +0100 (CET)
Received: (qmail 60735 invoked by uid 500); 21 Dec 2017 09:14:00 -0000
Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@brooklyn.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@brooklyn.apache.org>
List-Post: <mailto:commits@brooklyn.apache.org>
List-Id: <commits.brooklyn.apache.org>
Reply-To: dev@brooklyn.apache.org
Delivered-To: mailing list commits@brooklyn.apache.org
Received: (qmail 60725 invoked by uid 99); 21 Dec 2017 09:14:00 -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, 21 Dec 2017 09:14:00 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 593AFDFC27; Thu, 21 Dec 2017 09:14:00 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: tbouron@apache.org
To: commits@brooklyn.apache.org
Date: Thu, 21 Dec 2017 09:14:00 -0000
Message-Id: <a56d84a3e59a479c8cb3541b89b779c9@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/2] brooklyn-library git commit: Fix NPE in CouchbaseCluster
 enricher
archived-at: Thu, 21 Dec 2017 09:14:02 -0000

Repository: brooklyn-library
Updated Branches:
  refs/heads/master d3562cd7c -> 99695bc21


Fix NPE in CouchbaseCluster enricher


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

Branch: refs/heads/master
Commit: 4a5208e582ae94e552cc9cb4135487696c61dac3
Parents: d3562cd
Author: Aled Sage <aled.sage@gmail.com>
Authored: Wed Dec 20 23:57:41 2017 +0000
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Wed Dec 20 23:57:41 2017 +0000

----------------------------------------------------------------------
 .../brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java       | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/4a5208e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java
index 1c9a37c..ed8b7ee 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java
@@ -290,6 +290,7 @@ public class CouchbaseClusterImpl extends DynamicClusterImpl implements Couchbas
     private final static class ListOfHostAndPort implements Function<Set<Entity>, List<String>> {
         @Override public List<String> apply(Set<Entity> input) {
             List<String> addresses = Lists.newArrayList();
+            if (input == null) return addresses;
             for (Entity entity : input) {
                 addresses.add(String.format("%s",
                         BrooklynAccessUtils.getBrooklynAccessibleAddress(entity, entity.getAttribute(CouchbaseNode.COUCHBASE_WEB_ADMIN_PORT))));