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 2C94D11688 for ; Tue, 22 Apr 2014 09:23:04 +0000 (UTC) Received: (qmail 28795 invoked by uid 500); 22 Apr 2014 09:23:03 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 28721 invoked by uid 500); 22 Apr 2014 09:23:02 -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 28709 invoked by uid 99); 22 Apr 2014 09:23:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Apr 2014 09:23:00 +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; Tue, 22 Apr 2014 09:22:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C4F8F238889B; Tue, 22 Apr 2014 09:22:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1589049 - /sling/trunk/contrib/extensions/resource-inventory/src/main/java/org/apache/sling/resource/inventory/impl/JsonObjectCreator.java Date: Tue, 22 Apr 2014 09:22:39 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140422092239.C4F8F238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Tue Apr 22 09:22:39 2014 New Revision: 1589049 URL: http://svn.apache.org/r1589049 Log: SLING-3507 : Potential NPE in JSON dump from JMX Modified: sling/trunk/contrib/extensions/resource-inventory/src/main/java/org/apache/sling/resource/inventory/impl/JsonObjectCreator.java Modified: sling/trunk/contrib/extensions/resource-inventory/src/main/java/org/apache/sling/resource/inventory/impl/JsonObjectCreator.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resource-inventory/src/main/java/org/apache/sling/resource/inventory/impl/JsonObjectCreator.java?rev=1589049&r1=1589048&r2=1589049&view=diff ============================================================================== --- sling/trunk/contrib/extensions/resource-inventory/src/main/java/org/apache/sling/resource/inventory/impl/JsonObjectCreator.java (original) +++ sling/trunk/contrib/extensions/resource-inventory/src/main/java/org/apache/sling/resource/inventory/impl/JsonObjectCreator.java Tue Apr 22 09:22:39 2014 @@ -130,8 +130,10 @@ public abstract class JsonObjectCreator return value; } else if ( value instanceof Double ) { return value; - } else { + } else if ( value != null ) { return value.toString(); + } else { + return ""; // assume empty string } }