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 6AC8F200D54 for ; Fri, 8 Dec 2017 09:24:19 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 69381160BF2; Fri, 8 Dec 2017 08:24:19 +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 A7912160C0D for ; Fri, 8 Dec 2017 09:24:18 +0100 (CET) Received: (qmail 78747 invoked by uid 500); 8 Dec 2017 08:24:17 -0000 Mailing-List: contact dev-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list dev@activemq.apache.org Received: (qmail 78727 invoked by uid 99); 8 Dec 2017 08:24:17 -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; Fri, 08 Dec 2017 08:24:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 640B1F17FA; Fri, 8 Dec 2017 08:24:17 +0000 (UTC) From: michaelandrepearce To: dev@activemq.apache.org Reply-To: dev@activemq.apache.org References: In-Reply-To: Subject: [GitHub] activemq-artemis pull request #1696: NO-JIRA fixed minor regression and brok... Content-Type: text/plain Message-Id: <20171208082417.640B1F17FA@git1-us-west.apache.org> Date: Fri, 8 Dec 2017 08:24:17 +0000 (UTC) archived-at: Fri, 08 Dec 2017 08:24:19 -0000 Github user michaelandrepearce commented on a diff in the pull request: https://github.com/apache/activemq-artemis/pull/1696#discussion_r155723971 --- Diff: artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java --- @@ -1737,8 +1737,12 @@ public String listAddresses(String options, int page, int pageSize) throws Excep try { final Set addresses = server.getPostOffice().getAddresses(); List addressInfo = new ArrayList<>(); - for (SimpleString address:addresses) { - addressInfo.add(server.getPostOffice().getAddressInfo(address)); + for (SimpleString address : addresses) { + AddressInfo info = server.getPostOffice().getAddressInfo(address); + //ignore if no longer available + if (info != null) { --- End diff -- Nice check. ---