You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by se...@apache.org on 2005/09/30 14:56:29 UTC
svn commit: r292717 - in /jakarta/turbine/core/branches/TURBINE_2_3_BRANCH:
src/java/org/apache/turbine/modules/ActionEvent.java
src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java
xdocs/changes.xml
Author: seade
Date: Fri Sep 30 05:56:23 2005
New Revision: 292717
URL: http://svn.apache.org/viewcvs?rev=292717&view=rev
Log:
Exceptions that occur in Actions once again redirect to the error page.
This pretty much backs out the changes in revision 221603.
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/modules/ActionEvent.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/modules/ActionEvent.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/modules/ActionEvent.java?rev=292717&r1=292716&r2=292717&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/modules/ActionEvent.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/modules/ActionEvent.java Fri Sep 30 05:56:23 2005
@@ -183,11 +183,9 @@
throw new NoSuchMethodException("ActionEvent: The button was null");
}
- Method method = null;
-
try
{
- method = getClass().getMethod(theButton, methodParams);
+ Method method = getClass().getMethod(theButton, methodParams);
Object[] methodArgs = new Object[] { data };
if (log.isDebugEnabled())
@@ -200,7 +198,14 @@
catch (InvocationTargetException ite)
{
Throwable t = ite.getTargetException();
- log.error("Invokation of " + method , t);
+ if (t instanceof Exception)
+ {
+ throw (Exception) t;
+ }
+ else
+ {
+ throw ite;
+ }
}
finally
{
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java?rev=292717&r1=292716&r2=292717&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java Fri Sep 30 05:56:23 2005
@@ -122,10 +122,9 @@
"ActionEvent: The button was null");
}
- Method method = null;
try
{
- method = getClass().getMethod(theButton, methodParams);
+ Method method = getClass().getMethod(theButton, methodParams);
Object[] methodArgs = new Object[] { data, context };
if (log.isDebugEnabled())
@@ -150,7 +149,14 @@
catch (InvocationTargetException ite)
{
Throwable t = ite.getTargetException();
- log.error("Invokation of " + method , t);
+ if (t instanceof Exception)
+ {
+ throw (Exception) t;
+ }
+ else
+ {
+ throw ite;
+ }
}
finally
{
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml?rev=292717&r1=292716&r2=292717&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml Fri Sep 30 05:56:23 2005
@@ -24,6 +24,11 @@
</properties>
<body>
+ <release version="2.3.2" date="2005-09-30">
+ <action type="fix" dev="seade">
+ Exceptions that occur in Actions once again redirect to the error page.
+ </action>
+ </release>
<release version="2.3.2-rc2" date="2005-09-19">
<action type="fix" dev="henning" issue="TRB-5" due-to="Thomas Vandahl">
The skin properties file must be loaded as stream from the filesystem
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org