kimptoc 01/11/26 08:37:33
Modified: src/java/org/apache/jetspeed/modules/actions
CreateNewUserAndConfirm.java
Log:
enclose the more of the method in a try block to provide better error handling
Revision Changes Path
1.24 +39 -39
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/CreateNewUserAndConfirm.java
Index: CreateNewUserAndConfirm.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/CreateNewUserAndConfirm.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- CreateNewUserAndConfirm.java 2001/11/25 20:58:03 1.23
+++ CreateNewUserAndConfirm.java 2001/11/26 16:37:33 1.24
@@ -107,50 +107,49 @@
{
public void doPerform( RunData data ) throws Exception
{
-
- String submit = "submit1";
- String str = (String) data.getUser().getTemp ( submit, "asdfasdf" );
- if ( str != null && str
- .equalsIgnoreCase( data.getParameters().getString(submit, "")) )
+ try
{
- data.getUser().removeTemp(submit);
- data.setScreenTemplate( TurbineTemplate.getDefaultScreen() );
- return;
- }
+
+ String submit = "submit1";
+ String str = (String) data.getUser().getTemp ( submit, "asdfasdf" );
+ if ( str != null && str
+ .equalsIgnoreCase( data.getParameters().getString(submit, "")) )
+ {
+ data.getUser().removeTemp(submit);
+ data.setScreenTemplate( TurbineTemplate.getDefaultScreen() );
+ return;
+ }
- String pass1 = data.getParameters().getString("password", "");
- String pass2 = data.getParameters().getString("password_confirm", "");
- // make sure the passwords are not empty
- if ( (pass1.length() == 0 || pass2.length() == 0 )
- || ! pass1.equals ( pass2 ) )
- {
-
data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_PWNOTMATCH"));
- data.setScreenTemplate("NewAccount");
- return;
- }
+ String pass1 = data.getParameters().getString("password", "");
+ String pass2 = data.getParameters().getString("password_confirm", "");
+ // make sure the passwords are not empty
+ if ( (pass1.length() == 0 || pass2.length() == 0 )
+ || ! pass1.equals ( pass2 ) )
+ {
+
data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_PWNOTMATCH"));
+ data.setScreenTemplate("NewAccount");
+ return;
+ }
- String username = data.getParameters().getString("username", "");
- // make sure the username exists
- if ( username.length() == 0 )
- {
-
data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_NOUSERNAME"));
- data.setScreenTemplate("NewAccount");
- return;
- }
- String email = data.getParameters().getString("email", "");
- // make sure the email exists
- if ( email.length() == 0 )
- {
-
data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_NOEMAIL"));
- data.setScreenTemplate("NewAccount");
- return;
- }
+ String username = data.getParameters().getString("username", "");
+ // make sure the username exists
+ if ( username.length() == 0 )
+ {
+
data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_NOUSERNAME"));
+ data.setScreenTemplate("NewAccount");
+ return;
+ }
+ String email = data.getParameters().getString("email", "");
+ // make sure the email exists
+ if ( email.length() == 0 )
+ {
+
data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_NOEMAIL"));
+ data.setScreenTemplate("NewAccount");
+ return;
+ }
- String CHNAME =
Localization.getString("CREATENEWUSERANDCONFIRM_DUPLICATEMSG");
-
+ String CHNAME =
Localization.getString("CREATENEWUSERANDCONFIRM_DUPLICATEMSG");
- try
- {
if (!JetspeedSecurity.accountExists(username))
{
Date now = new Date();
@@ -228,6 +227,7 @@
}
catch (Exception e)
{
+ Log.error("CreateNewUserAndConfirm",e);
data.setMessage(e.toString());
data.setStackTrace(StringUtils.stackTrace(e), e);
data.setScreenTemplate("Error");
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
