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 34741200C28 for ; Mon, 13 Mar 2017 09:21:07 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 32EFC160B6C; Mon, 13 Mar 2017 08:21:07 +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 7AF44160B60 for ; Mon, 13 Mar 2017 09:21:06 +0100 (CET) Received: (qmail 46397 invoked by uid 500); 13 Mar 2017 08:21:05 -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 46388 invoked by uid 99); 13 Mar 2017 08:21:05 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Mar 2017 08:21:05 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 3DE353A1388 for ; Mon, 13 Mar 2017 08:21:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1786639 - /sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModel.java Date: Mon, 13 Mar 2017 08:21:05 -0000 To: commits@sling.apache.org From: radu@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170313082105.3DE353A1388@svn01-us-west.apache.org> archived-at: Mon, 13 Mar 2017 08:21:07 -0000 Author: radu Date: Mon Mar 13 08:21:05 2017 New Revision: 1786639 URL: http://svn.apache.org/viewvc?rev=1786639&view=rev Log: SLING-6633 - [HTL] NumberFormat should support String-properties with number value Modified: sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModel.java Modified: sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModel.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModel.java?rev=1786639&r1=1786638&r2=1786639&view=diff ============================================================================== --- sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModel.java (original) +++ sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModel.java Mon Mar 13 08:21:05 2017 @@ -35,6 +35,7 @@ import java.util.Map; import java.util.Set; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.math.NumberUtils; import org.apache.sling.scripting.sightly.Record; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -75,7 +76,11 @@ public abstract class AbstractRuntimeObj @Override public boolean isNumber(Object target) { - return (target instanceof Number); + if (target == null) { + return false; + } + String value = toString(target); + return NumberUtils.isNumber(value); } @Override @@ -102,10 +107,12 @@ public abstract class AbstractRuntimeObj @Override public Number toNumber(Object object) { - if (object instanceof Number) { - return (Number) object; + String stringValue = toString(object); + try { + return NumberUtils.createNumber(stringValue); + } catch (NumberFormatException e) { + return null; } - return null; } public Date toDate(Object object) {