Author: rahul
Date: Sat Oct  8 21:58:15 2005
New Revision: 307365

URL: http://svn.apache.org/viewcvs?rev=307365&view=rev
Log:
1) Allow FunctionMapper access to subclasses.
2) VariableResolver#resolveVariable() should return null if variable is not 
found instead of throwing an exception.

Modified:
    
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jsp/ELEvaluator.java

Modified: 
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jsp/ELEvaluator.java
URL: 
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jsp/ELEvaluator.java?rev=307365&r1=307364&r2=307365&view=diff
==============================================================================
--- 
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jsp/ELEvaluator.java
 (original)
+++ 
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jsp/ELEvaluator.java
 Sat Oct  8 21:58:15 2005
@@ -42,9 +42,9 @@
 public class ELEvaluator implements Evaluator {
 
     /** Implementation independent log category. */
-    private static Log log = LogFactory.getLog(Evaluator.class);
+    protected static Log log = LogFactory.getLog(Evaluator.class);
     /** Function Mapper for SCXML expressions. */
-    private FunctionMapper fm = new FunctWrapper();
+    protected FunctionMapper fm = new FunctWrapper();
     /** Pattern for recognizing the SCXML In() special predicate. */
     private static Pattern inFct = Pattern.compile("In\\(");
 
@@ -147,7 +147,7 @@
         public Object resolveVariable(final String pName) throws ELException {
             Object rslt = ctx.get(pName);
             if (rslt == null) {
-                throw new ELException("Variable " + pName + "does not exist!");
+                log.info("Variable \"" + pName + "\" does not exist!");
             }
             return rslt;
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to