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 C4C91106AD for ; Fri, 6 Sep 2013 14:51:26 +0000 (UTC) Received: (qmail 90000 invoked by uid 500); 6 Sep 2013 14:51:26 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 89935 invoked by uid 500); 6 Sep 2013 14:51:26 -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 89928 invoked by uid 99); 6 Sep 2013 14:51:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Sep 2013 14:51:25 +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; Fri, 06 Sep 2013 14:51:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 790D8238890D; Fri, 6 Sep 2013 14:51:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1520588 - in /sling/trunk/contrib/extensions/healthcheck: core/src/main/java/org/apache/sling/hc/core/impl/JmxScriptBindingsProvider.java samples/src/main/java/org/apache/sling/hc/samples/impl/OsgiScriptBindingsProvider.java Date: Fri, 06 Sep 2013 14:51:04 -0000 To: commits@sling.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130906145104.790D8238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bdelacretaz Date: Fri Sep 6 14:51:04 2013 New Revision: 1520588 URL: http://svn.apache.org/r1520588 Log: SLING-3034 - avoid NPE Modified: sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/JmxScriptBindingsProvider.java sling/trunk/contrib/extensions/healthcheck/samples/src/main/java/org/apache/sling/hc/samples/impl/OsgiScriptBindingsProvider.java Modified: sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/JmxScriptBindingsProvider.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/JmxScriptBindingsProvider.java?rev=1520588&r1=1520587&r2=1520588&view=diff ============================================================================== --- sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/JmxScriptBindingsProvider.java (original) +++ sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/JmxScriptBindingsProvider.java Fri Sep 6 14:51:04 2013 @@ -78,6 +78,7 @@ public class JmxScriptBindingsProvider i final Object resultLog = b.get(logBindingName); if(resultLog == null) { log.info("No {} found in Bindings, cannot activate {} binding", logBindingName, JMX_BINDING_NAME); + return; } try { b.put("jmx", new AttributeBinding(jmxServer, (FormattingResultLog)resultLog)); Modified: sling/trunk/contrib/extensions/healthcheck/samples/src/main/java/org/apache/sling/hc/samples/impl/OsgiScriptBindingsProvider.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/samples/src/main/java/org/apache/sling/hc/samples/impl/OsgiScriptBindingsProvider.java?rev=1520588&r1=1520587&r2=1520588&view=diff ============================================================================== --- sling/trunk/contrib/extensions/healthcheck/samples/src/main/java/org/apache/sling/hc/samples/impl/OsgiScriptBindingsProvider.java (original) +++ sling/trunk/contrib/extensions/healthcheck/samples/src/main/java/org/apache/sling/hc/samples/impl/OsgiScriptBindingsProvider.java Fri Sep 6 14:51:04 2013 @@ -102,6 +102,7 @@ public class OsgiScriptBindingsProvider final Object resultLog = b.get(logBindingName); if(resultLog == null) { log.info("No {} found in Bindings, cannot activate {} binding", logBindingName, OSGI_BINDING_NAME); + return; } try { b.put("osgi", new OsgiBinding(bundleContext, (FormattingResultLog)resultLog));