Author: pbenedict
Date: Fri Jul 20 22:59:55 2007
New Revision: 558251
URL: http://svn.apache.org/viewvc?view=rev&rev=558251
Log:
STR-2437: Add root cause to exceptions
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionForm.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionFormClass.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/CopyFormToContext.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionForm.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionForm.java?view=diff&rev=558251&r1=558250&r2=558251
==============================================================================
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionForm.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionForm.java
Fri Jul 20 22:59:55 2007
@@ -485,7 +485,7 @@
try {
((List) prop).set(index, value);
} catch (ClassCastException e) {
- throw new ConversionException(e.getMessage());
+ throw new ConversionException(e.getMessage(), e);
}
} else {
throw new IllegalArgumentException("Non-indexed property for '"
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionFormClass.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionFormClass.java?view=diff&rev=558251&r1=558250&r2=558251
==============================================================================
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionFormClass.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionFormClass.java
Fri Jul 20 22:59:55 2007
@@ -252,7 +252,7 @@
} catch (Throwable t) {
throw new IllegalArgumentException(
"Cannot instantiate ActionFormBean class '" + config.getType()
- + "': " + t);
+ + "'", t);
}
if (!DynaActionForm.class.isAssignableFrom(beanClass)) {
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java?view=diff&rev=558251&r1=558250&r2=558251
==============================================================================
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
Fri Jul 20 22:59:55 2007
@@ -164,7 +164,7 @@
} catch (Exception e) {
LOG.warn("Exception from exceptionCommand '" + exceptionCommand
+ "'", e);
- throw new IllegalStateException("Exception chain threw exception");
+ throw new IllegalStateException("Exception chain threw exception",
e);
}
return (true);
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/CopyFormToContext.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/CopyFormToContext.java?view=diff&rev=558251&r1=558250&r2=558251
==============================================================================
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/CopyFormToContext.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/CopyFormToContext.java
Fri Jul 20 22:59:55 2007
@@ -252,7 +252,7 @@
context = (ActionContextBase) ctx;
} catch (ClassCastException e) {
throw new IllegalStateException("ActionContext [" + ctx + "]"
- + " must be subclass of ActionContextBase");
+ + " must be subclass of ActionContextBase", e);
}
ActionForm form =
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java?view=diff&rev=558251&r1=558250&r2=558251
==============================================================================
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java
Fri Jul 20 22:59:55 2007
@@ -583,18 +583,15 @@
(MultipartRequestHandler)
applicationInstance(multipartClass);
} catch (ClassNotFoundException cnfe) {
throw new ServletException("Cannot find multipart class \""
- + multipartClass + "\"" + ", exception: "
- + cnfe.getMessage());
+ + multipartClass + "\"", cnfe);
} catch (InstantiationException ie) {
throw new ServletException(
"InstantiationException when instantiating "
- + "multipart class \"" + multipartClass + "\", exception: "
- + ie.getMessage());
+ + "multipart class \"" + multipartClass + "\"", ie);
} catch (IllegalAccessException iae) {
throw new ServletException(
"IllegalAccessException when instantiating "
- + "multipart class \"" + multipartClass + "\", exception: "
- + iae.getMessage());
+ + "multipart class \"" + multipartClass + "\"", iae);
}
if (multipartHandler != null) {
