You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2014/06/12 21:36:29 UTC
svn commit: r1602275 - in
/sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei:
AdaptToTEI.java GetPropertyTEI.java
Author: dklco
Date: Thu Jun 12 19:36:29 2014
New Revision: 1602275
URL: http://svn.apache.org/r1602275
Log:
Fixing SLING-3664, fixed issues where the TEI classes were causing issues with the JSP compilation when using unexpected or invalid parameters
Modified:
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/AdaptToTEI.java
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/GetPropertyTEI.java
Modified: sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/AdaptToTEI.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/AdaptToTEI.java?rev=1602275&r1=1602274&r2=1602275&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/AdaptToTEI.java (original)
+++ sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/AdaptToTEI.java Thu Jun 12 19:36:29 2014
@@ -18,12 +18,24 @@ package org.apache.sling.scripting.jsp.t
import javax.servlet.jsp.tagext.TagData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class AdaptToTEI extends AbstractVarTEI {
- public static final String ATTR_ADAPT_TO = "adaptTo";
+ private static final Logger log = LoggerFactory.getLogger(AdaptToTEI.class);
+ public static final String ATTR_ADAPT_TO = "adaptTo";
+
+ @Override
+ protected String getClassName(TagData data) {
- @Override
- protected String getClassName(TagData data) {
- return data.getAttributeString(ATTR_ADAPT_TO);
- }
+ String clazz = data.getAttributeString(ATTR_ADAPT_TO);
+ try {
+ AdaptToTEI.class.getClassLoader().loadClass(clazz);
+ return clazz;
+ } catch (ClassNotFoundException e) {
+ log.warn("Unable to retrieve class " + clazz, e);
+ }
+ return Object.class.getName();
+ }
}
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=1602275&r1=1602274&r2=1602275&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 Thu Jun 12 19:36:29 2014
@@ -29,8 +29,10 @@ public class GetPropertyTEI extends Abst
final String className = data.getAttributeString(ATTR_RETURN_CLASS);
if (defaultValue != null) {
return defaultValue.getClass().getName();
- } else {
+ } else if (className != null){
return className;
+ } else {
+ return Object.class.getName();
}
}
}