Author: niallp
Date: Tue Apr 26 12:03:35 2005
New Revision: 164858
URL: http://svn.apache.org/viewcvs?rev=164858&view=rev
Log:
Port fix for PR #31658 to 1.2.x branch - LogonAction does not check errors in
appropriate place
Modified:
struts/core/branches/STRUTS_1_2_BRANCH/src/example/org/apache/struts/webapp/example/LogonAction.java
Modified:
struts/core/branches/STRUTS_1_2_BRANCH/src/example/org/apache/struts/webapp/example/LogonAction.java
URL:
http://svn.apache.org/viewcvs/struts/core/branches/STRUTS_1_2_BRANCH/src/example/org/apache/struts/webapp/example/LogonAction.java?rev=164858&r1=164857&r2=164858&view=diff
==============================================================================
---
struts/core/branches/STRUTS_1_2_BRANCH/src/example/org/apache/struts/webapp/example/LogonAction.java
(original)
+++
struts/core/branches/STRUTS_1_2_BRANCH/src/example/org/apache/struts/webapp/example/LogonAction.java
Tue Apr 26 12:03:35 2005
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright 2000-2004 Apache Software Foundation
+ * Copyright 2000-2005 Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -140,18 +140,19 @@
// Retrieve user
User user = getUser(database,username,password,errors);
- // Save (or clear) user object
- SaveUser(request,user);
-
// Report back any errors, and exit if any
if (!errors.isEmpty()) {
this.saveErrors(request, errors);
return (mapping.getInputForward());
}
+ // Save user object
+ SaveUser(request,user);
+
+
// Otherwise, return "success"
return (findSuccess(mapping));
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
