knguyen 2005/06/09 14:03:05 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/data/fields ExpressionMarker.java
Log:
- skip evaluating Expression if we are not in a real HttpServletRequest
Revision Changes Path
1.4.2.1.2.1 +8 -0
jahia/src/java/org/jahia/data/fields/ExpressionMarker.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/data/fields/ExpressionMarker.java.diff?r1=1.4.2.1&r2=1.4.2.1.2.1&f=h
Index: ExpressionMarker.java
===================================================================
RCS file:
/cvs/jahia/src/java/org/jahia/data/fields/Attic/ExpressionMarker.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.1.2.1
diff -u -r1.4.2.1 -r1.4.2.1.2.1
--- ExpressionMarker.java 19 Aug 2004 17:30:48 -0000 1.4.2.1
+++ ExpressionMarker.java 9 Jun 2005 12:03:05 -0000 1.4.2.1.2.1
@@ -1,6 +1,8 @@
package org.jahia.data.fields;
import org.jahia.params.ParamBean;
+import org.jahia.params.DummyServletRequestWrapper;
+
import java.util.Collections;
import org.jahia.utils.JahiaTools;
import java.util.Vector;
@@ -123,6 +125,12 @@
public static String getValue(String value, ParamBean paramBean)
throws JahiaException {
+ // Expression only work if we are in HttpServletRequest context
+ if ( paramBean == null || paramBean.getRealRequest() == null
+ || (paramBean.getRealRequest() instanceof
DummyServletRequestWrapper) ){
+ return value;
+ }
+
ExpressionMarker marker =
ExpressionMarker.parseMarkerValue(value, paramBean);
if ( marker == null ){
