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 08:21:01 UTC
svn commit: r1786638 - in /sling/trunk/bundles/scripting/sightly:
engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/FormatFilterExtension.java
testing-content/pom.xml testing/pom.xml
Author: radu
Date: Mon Mar 13 08:21:01 2017
New Revision: 1786638
URL: http://svn.apache.org/viewvc?rev=1786638&view=rev
Log:
SLING-6632 - [HTL] NumberFormat is printed when format is empty
Modified:
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/FormatFilterExtension.java
sling/trunk/bundles/scripting/sightly/testing-content/pom.xml
sling/trunk/bundles/scripting/sightly/testing/pom.xml
Modified: sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/FormatFilterExtension.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/FormatFilterExtension.java?rev=1786638&r1=1786637&r2=1786638&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/FormatFilterExtension.java (original)
+++ sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/FormatFilterExtension.java Mon Mar 13 08:21:01 2017
@@ -79,8 +79,11 @@ public class FormatFilterExtension imple
Locale locale = getLocale(runtimeObjectModel, options);
return formatNumber(source, runtimeObjectModel.toNumber(formatObject), locale);
}
- Object[] params = decodeParams(runtimeObjectModel, formatObject);
- return formatString(runtimeObjectModel, source, params);
+ if (hasPlaceHolders) {
+ Object[] params = decodeParams(runtimeObjectModel, formatObject);
+ return formatString(runtimeObjectModel, source, params);
+ }
+ return null;
}
private Locale getLocale(RuntimeObjectModel runtimeObjectModel, Map<String, Object> options) {
Modified: sling/trunk/bundles/scripting/sightly/testing-content/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing-content/pom.xml?rev=1786638&r1=1786637&r2=1786638&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/testing-content/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/testing-content/pom.xml Mon Mar 13 08:21:01 2017
@@ -100,7 +100,7 @@
<artifactItem>
<groupId>io.sightly</groupId>
<artifactId>io.sightly.tck</artifactId>
- <version>1.3.1</version>
+ <version>1.3.2</version>
<type>jar</type>
<outputDirectory>${project.build.directory}/sightlytck/</outputDirectory>
<includes>**/*.html,**/*.js,**/*.java</includes>
Modified: sling/trunk/bundles/scripting/sightly/testing/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing/pom.xml?rev=1786638&r1=1786637&r2=1786638&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/testing/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/testing/pom.xml Mon Mar 13 08:21:01 2017
@@ -392,7 +392,7 @@
<dependency>
<groupId>io.sightly</groupId>
<artifactId>io.sightly.tck</artifactId>
- <version>1.3.1</version>
+ <version>1.3.2</version>
<scope>test</scope>
<exclusions>
<exclusion>