brekke 01/09/09 19:48:57 Modified: src/java/org/apache/turbine/modules/actions/sessionvalidator TemplateSessionValidator.java Log: Patch from Johnny Cass: > I think I might have found a possible bug in one of the > SessionValidators of jakarta-turbine-2. > > The way I see it, 'prev_template' needs to be saved to the user's > temporary storage *before* the screen template is changed. > > The 'template.invalidstate' parameter should probably also be added to > TurbineResources.properties and / or TurbineResources.master files? Revision Changes Path 1.2 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java Index: TemplateSessionValidator.java =================================================================== RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TemplateSessionValidator.java 2001/08/16 05:08:33 1.1 +++ TemplateSessionValidator.java 2001/09/10 02:48:57 1.2 @@ -72,7 +72,7 @@ * @see TemplateSecureSessionValidator * @author <a href="mailto:[EMAIL PROTECTED]">John D. McNally</a> * @author <a href="mailto:[EMAIL PROTECTED]">Dave Bryson</a> - * @version $Id: TemplateSessionValidator.java,v 1.1 2001/08/16 05:08:33 jvanzyl Exp $ + * @version $Id: TemplateSessionValidator.java,v 1.2 2001/09/10 02:48:57 brekke Exp $ */ public class TemplateSessionValidator extends SessionValidator { @@ -125,11 +125,11 @@ { if (data.getTemplateInfo().getScreenTemplate() != null) { + data.getUser().setTemp( "prev_template", + data.getTemplateInfo().getScreenTemplate() ); data.getTemplateInfo().setScreenTemplate( TurbineResources.getString( TurbineConstants.TEMPLATE_INVALID_STATE) ); - data.getUser().setTemp( "prev_template", - data.getTemplateInfo().getScreenTemplate() ); } else { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]