You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/11/16 04:38:36 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/modules/actions/sessionvalidator TemplateSecureSessionValidator.java TemplateSessionValidator.java
jvanzyl 01/11/15 19:38:36
Modified: src/java/org/apache/turbine/modules/actions/sessionvalidator
TemplateSecureSessionValidator.java
TemplateSessionValidator.java
Log:
- applying patches submitted by Scott Eade.
Revision Changes Path
1.3 +3 -2 jakarta-turbine-2/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java
Index: TemplateSecureSessionValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TemplateSecureSessionValidator.java 2001/10/15 17:01:58 1.2
+++ TemplateSecureSessionValidator.java 2001/11/16 03:38:35 1.3
@@ -79,7 +79,7 @@
*
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: TemplateSecureSessionValidator.java,v 1.2 2001/10/15 17:01:58 jmcnally Exp $
+ * @version $Id: TemplateSecureSessionValidator.java,v 1.3 2001/11/16 03:38:35 jvanzyl Exp $
*/
public class TemplateSecureSessionValidator extends SessionValidator
{
@@ -173,9 +173,10 @@
}
else
{
+ data.getUser().setTemp( "prev_screen",
+ data.getScreen().replace('/', ',') );
data.setScreen( TurbineResources.getString(
TurbineConstants.SCREEN_INVALID_STATE) );
- data.getUser().setTemp( "prev_screen", data.getScreen() );
}
data.getUser()
.setTemp( "prev_parameters", data.getParameters() );
1.3 +5 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TemplateSessionValidator.java 2001/09/10 02:48:57 1.2
+++ TemplateSessionValidator.java 2001/11/16 03:38:35 1.3
@@ -72,7 +72,7 @@
* @see TemplateSecureSessionValidator
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: TemplateSessionValidator.java,v 1.2 2001/09/10 02:48:57 brekke Exp $
+ * @version $Id: TemplateSessionValidator.java,v 1.3 2001/11/16 03:38:35 jvanzyl Exp $
*/
public class TemplateSessionValidator extends SessionValidator
{
@@ -126,16 +126,18 @@
if (data.getTemplateInfo().getScreenTemplate() != null)
{
data.getUser().setTemp( "prev_template",
- data.getTemplateInfo().getScreenTemplate() );
+ data.getTemplateInfo().getScreenTemplate()
+ .replace('/', ',') );
data.getTemplateInfo().setScreenTemplate(
TurbineResources.getString(
TurbineConstants.TEMPLATE_INVALID_STATE) );
}
else
{
+ data.getUser().setTemp( "prev_screen",
+ data.getScreen().replace('/', ',') );
data.setScreen( TurbineResources.getString(
TurbineConstants.SCREEN_INVALID_STATE) );
- data.getUser().setTemp( "prev_screen", data.getScreen() );
}
data.getUser().setTemp("prev_parameters", data.getParameters());
data.setAction( "" );
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>