You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2017/03/13 13:45:20 UTC
svn commit: r1786688 -
/sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModel.java
Author: radu
Date: Mon Mar 13 13:45:20 2017
New Revision: 1786688
URL: http://svn.apache.org/viewvc?rev=1786688&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=1786688&r1=1786687&r2=1786688&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 13:45:20 2017
@@ -79,6 +79,9 @@ public abstract class AbstractRuntimeObj
if (target == null) {
return false;
}
+ if (target instanceof Number) {
+ return true;
+ }
String value = toString(target);
return NumberUtils.isNumber(value);
}
@@ -107,6 +110,12 @@ public abstract class AbstractRuntimeObj
@Override
public Number toNumber(Object object) {
+ if (object == null) {
+ return null;
+ }
+ if (object instanceof Number) {
+ return (Number) object;
+ }
String stringValue = toString(object);
try {
return NumberUtils.createNumber(stringValue);