You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by rb...@apache.org on 2013/01/21 17:23:16 UTC
svn commit: r1436455 -
/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
Author: rbaxter85
Date: Mon Jan 21 16:23:15 2013
New Revision: 1436455
URL: http://svn.apache.org/viewvc?rev=1436455&view=rev
Log:
shindig-1588
Committed For Zhi Hong Yang
PropertyNotFoundException handle(Variable Substitution should support EL syntax)
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java?rev=1436455&r1=1436454&r2=1436455&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java Mon Jan 21 16:23:15 2013
@@ -25,7 +25,9 @@ import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import javax.el.ELContext;
+import javax.el.PropertyNotFoundException;
import org.apache.commons.lang3.StringUtils;
import org.apache.shindig.common.JsonSerializer;
@@ -197,8 +199,14 @@ public class RenderingGadgetRewriter imp
private void processNode(Node source) {
switch (source.getNodeType()) {
case Node.TEXT_NODE:
- source.setTextContent(String.valueOf(expressions.parse(source.getTextContent(), String.class)
+ try {
+ source.setTextContent(String.valueOf(expressions.parse(source.getTextContent(), String.class)
.getValue(elContext)));
+ } catch (PropertyNotFoundException pe) {
+ if (LOG.isLoggable(Level.INFO)) {
+ LOG.log(Level.INFO, pe.getMessage(), pe);
+ }
+ }
break;
case Node.ELEMENT_NODE:
processChildNodes(source);