webwork/src/main/webwork/util ServletValueStack.java,1.5,1.6 ValueStack.java,1.60,1.61

Update of /cvsroot/opensymphony/webwork/src/main/webwork/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32149/src/main/webwork/util

Modified Files:
	ServletValueStack.java ValueStack.java 
Log Message:
Wrap IOExceptions correctly in tags
Unwrap InvocationTargetExceptions in VS so we can actually see the underlying error

Index: ServletValueStack.java
===================================================================
RCS file: /cvsroot/opensymphony/webwork/src/main/webwork/util/ServletValueStack.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ServletValueStack.java	1 Nov 2003 20:10:09 -0000	1.5
+++ ServletValueStack.java	28 Feb 2005 18:43:28 -0000	1.6
@@ -14,7 +14,7 @@
 /**
  *	Value stack implementation for a servlet based scenario.
  *
- *	@author Rickard Öberg ([email protected])
+ *	@author Rickard �berg ([email protected])
  * @author Maurice C. Parker ([email protected])
  *	@version $Revision$
  */

Index: ValueStack.java
===================================================================
RCS file: /cvsroot/opensymphony/webwork/src/main/webwork/util/ValueStack.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- ValueStack.java	4 Jun 2004 07:57:25 -0000	1.60
+++ ValueStack.java	28 Feb 2005 18:43:28 -0000	1.61
@@ -11,10 +11,7 @@
 
 import java.beans.*;
 import java.io.StringReader;
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Array;
+import java.lang.reflect.*;
 import java.util.*;
 
 import org.apache.commons.logging.Log;
@@ -432,7 +429,12 @@
                         log.error("Illegal parameters invoking " + value.getClass() + "." + target.getMethod().getName() + "(" +Arrays.asList(getParameterClasses(params)) + ")");
                         break objectWalk;
                      } catch (Exception e) {
-                        log.error("METHOD: \"" + segment.getId() + "\", exception: ", e);
+                        Throwable throwable = e;
+                        if(e instanceof InvocationTargetException)
+                        {
+                          throwable = ((InvocationTargetException)e).getTargetException();
+                        }
+                        log.error("METHOD: \"" + segment.getId() + "\", exception: ", throwable);
                         break objectWalk;
                         //throw new IllegalArgumentException("Invalid single method access. " +
                         //                                   "Error accessing method \"" + token.image +



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click