[JBoss-dev] CVS update: website-survey/src/main/org/jboss/survey/ejb/entity UserBean.java

[Andreas S. <sch...@us...>]

  User: schaefera
  Date: 02/03/19 15:12:31

  Modified:    src/main/org/jboss/survey/ejb/entity UserBean.java
  Log:
  Some Adjustments to Survey and adding JBoss 3.0 Beta to the download
  page of www.jboss.org.
  
  Revision  Changes    Path
  1.2       +7 -6      website-survey/src/main/org/jboss/survey/ejb/entity/UserBean.java
  
  Index: UserBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/website-survey/src/main/org/jboss/survey/ejb/entity/UserBean.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- UserBean.java	2 Oct 2001 21:34:56 -0000	1.1
  +++ UserBean.java	19 Mar 2002 23:12:31 -0000	1.2
  @@ -37,7 +37,7 @@
   * The Entity bean represents a User.
   *
   * @author Andreas Schaefer
  -* @version $Revision: 1.1 $
  +* @version $Revision: 1.2 $
   *
   * @ejb:bean name="jboss/survey/User"
   *           display-name="Registered User filling out the Survey"
  @@ -50,10 +50,13 @@
   *                  setdata="false"
   * @ejb:finder signature="java.util.Collection findAll()"
   * @ejb:finder signature="org.jboss.survey.ejb.entity.User findByEmail( java.lang.String pEmail )"
  +* @ejb:finder signature="org.jboss.survey.ejb.entity.User findOtherByEmail( int pId, java.lang.String pEmail )"
   * @ejb:finder signature="org.jboss.survey.ejb.entity.User findByEmailAndPassword( java.lang.String pEmail, java.lang.String pPassword )"
   *
   * @jboss:finder-query name="findByEmail"
   *                     query="Email = {0}"
  +* @jboss:finder-query name="findOtherByEmail"
  +*                     query="Id != {0} AND Email = {1}"
   * @jboss:finder-query name="findByEmailAndPassword"
   *                     query="Email = {0} AND Password = {1}"
   * @jboss:table-name table-name="User_Info"
  @@ -96,11 +99,9 @@
         // Check if the email address is not already saved
         try {
            UserHome lHome = (UserHome) mContext.getEJBHome();
  -         User lUser = lHome.findByEmail( pUser.getEmail() );
  -         if( lUser.getValueObject().getId() != pUser.getId() ) {
  -            // User with the given email address already exists retrieve instead of create a new one
  -            throw new InvalidValueException( "user.already.exists", new String[] { pUser.getEmail() } );
  -         }
  +         User lUser = lHome.findOtherByEmail( pUser.getId(), pUser.getEmail() );
  +         // User with the given email address already exists retrieve instead of create a new one
  +         throw new InvalidValueException( "user.already.exists", new String[] { pUser.getEmail() } );
         }
         catch( FinderException fe ) {
            // That's ok