You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by js...@apache.org on 2016/04/12 08:47:14 UTC
svn commit: r1738703 - in /sling/trunk:
bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/GetPropertyTEI.java
launchpad/integration-tests/src/main/resources/integration-test/taglib-test.jsp
Author: jsedding
Date: Tue Apr 12 06:47:13 2016
New Revision: 1738703
URL: http://svn.apache.org/viewvc?rev=1738703&view=rev
Log:
SLING-5658 - getProperty tag fails when returnClass parameter is an expression
Modified:
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/GetPropertyTEI.java
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/taglib-test.jsp
Modified: sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/GetPropertyTEI.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/GetPropertyTEI.java?rev=1738703&r1=1738702&r2=1738703&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/GetPropertyTEI.java (original)
+++ sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/GetPropertyTEI.java Tue Apr 12 06:47:13 2016
@@ -26,13 +26,13 @@ public class GetPropertyTEI extends Abst
@Override
protected String getClassName(TagData data) {
final Object defaultValue = data.getAttribute(ATTR_DEFAULT_VALUE);
- final String className = data.getAttributeString(ATTR_RETURN_CLASS);
+ final String className = safeGetStringAttribute(data, ATTR_RETURN_CLASS, OBJECT_CLASS_NAME);
if (defaultValue != null) {
return defaultValue.getClass().getName();
} else if (className != null){
return className;
} else {
- return Object.class.getName();
+ return OBJECT_CLASS_NAME;
}
}
}
Modified: sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/taglib-test.jsp
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/taglib-test.jsp?rev=1738703&r1=1738702&r2=1738703&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/taglib-test.jsp (original)
+++ sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/taglib-test.jsp Tue Apr 12 06:47:13 2016
@@ -58,6 +58,11 @@ Get Property Tag
Test 4: Default Value
Result: <sling:getProperty properties="${componentProps}" key="emptyKey" var="property4" defaultValue="bob" /><c:choose><c:when test="${not empty property4}">SUCCESS</c:when><c:otherwise>ERROR<c:set var="success" value="false" /></c:otherwise></c:choose>
+
+ Test 5: Test adapting when returnClass name is a run-time expression
+ <c:set var="returnClass5" value="java.util.Calendar"/>
+ <sling:getProperty properties="${componentProps}" key="jcr:created" var="property5" returnClass="${returnClass5}" />
+ result: <c:choose><c:when test="${not empty property5}">SUCCESS</c:when><c:otherwise>ERROR<c:set var="success" value="false" /></c:otherwise></c:choose>
Get Resource Tag
Test 1: Get Resource