[Swixat-cvscommit] swixat/src/main/java/org/swixat/framework/action HandleScriptFunctionAction.java, 1.2.2.2, 1.2.2.3

[JP <j-...@us...>]

Update of /cvsroot/swixat/swixat/src/main/java/org/swixat/framework/action
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32656/src/main/java/org/swixat/framework/action

Modified Files:
      Tag: B0_6_0
	HandleScriptFunctionAction.java 
Log Message:
Catch and log xpath runtime exceptions.

Index: HandleScriptFunctionAction.java
===================================================================
RCS file: /cvsroot/swixat/swixat/src/main/java/org/swixat/framework/action/HandleScriptFunctionAction.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** HandleScriptFunctionAction.java	21 Mar 2007 02:34:14 -0000	1.2.2.2
--- HandleScriptFunctionAction.java	2 Apr 2007 00:45:26 -0000	1.2.2.3
***************
*** 31,34 ****
--- 31,35 ----
  
  import org.apache.commons.jxpath.JXPathContext;
+ import org.apache.commons.jxpath.JXPathException;
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
***************
*** 115,123 ****
                  String fnArg = args[a].trim();
                  if (fnArg.startsWith("$")) {  // process arg as an xpath expression
!                     Object result = XPathUtil.applyXPath(fnArg, null, engine, false);
                      String argname = "_fn_arg_" + a;
                      i.setVariable(argname, result);
                      argList.append(argname);
!                 } else {
                      argList.append(fnArg);
                  }
--- 116,129 ----
                  String fnArg = args[a].trim();
                  if (fnArg.startsWith("$")) {  // process arg as an xpath expression
! 	                 Object result = null;
! 	                 try {
!                         result = XPathUtil.applyXPath(fnArg, null, engine, false);
! 	                 } catch (JXPathException xe) {
! 	                     log.error("Failed to process xpath expression " + fnArg, xe);
!                     }
                      String argname = "_fn_arg_" + a;
                      i.setVariable(argname, result);
                      argList.append(argname);
!                 } else { // process a literal argument
                      argList.append(fnArg);
                  }