Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D2C71104B7 for ; Mon, 3 Mar 2014 16:28:14 +0000 (UTC) Received: (qmail 62152 invoked by uid 500); 3 Mar 2014 16:28:13 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 62099 invoked by uid 500); 3 Mar 2014 16:28:13 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 62092 invoked by uid 99); 3 Mar 2014 16:28:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Mar 2014 16:28:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Mar 2014 16:28:11 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E1DBE238890D; Mon, 3 Mar 2014 16:27:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1573597 - /sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/resource/EstablishedClusterView.java Date: Mon, 03 Mar 2014 16:27:51 -0000 To: commits@sling.apache.org From: stefanegli@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140303162751.E1DBE238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stefanegli Date: Mon Mar 3 16:27:51 2014 New Revision: 1573597 URL: http://svn.apache.org/r1573597 Log: SLING-3296 : more explicit exception message Modified: sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/resource/EstablishedClusterView.java Modified: sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/resource/EstablishedClusterView.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/resource/EstablishedClusterView.java?rev=1573597&r1=1573596&r2=1573597&view=diff ============================================================================== --- sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/resource/EstablishedClusterView.java (original) +++ sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/resource/EstablishedClusterView.java Mon Mar 3 16:27:51 2014 @@ -53,7 +53,15 @@ public class EstablishedClusterView exte super(view.getViewId()); String leaderId = view.getResource().adaptTo(ValueMap.class).get("leaderId", String.class); - final Iterator it1 = view.getResource().getChild("members") + final Resource viewRes = view.getResource(); + if (viewRes == null) { + throw new IllegalStateException("viewRes must not be null"); + } + final Resource members = viewRes.getChild("members"); + if (members == null) { + throw new IllegalStateException("members must not be null"); + } + final Iterator it1 = members .getChildren().iterator(); final List instanceRess = new LinkedList(); while (it1.hasNext()) {