[jboss-cvs] jboss-seam/src/main/org/jboss/seam/security ...

[Shane Bryzak]

  User: sbryzak2
  Date: 07/11/15 20:08:05

  Modified:    src/main/org/jboss/seam/security  Identity.java
  Log:
  more unit test-friendly
  
  Revision  Changes    Path
  1.108     +8 -8      jboss-seam/src/main/org/jboss/seam/security/Identity.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Identity.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/Identity.java,v
  retrieving revision 1.107
  retrieving revision 1.108
  diff -u -b -r1.107 -r1.108
  --- Identity.java	14 Nov 2007 04:57:40 -0000	1.107
  +++ Identity.java	16 Nov 2007 01:08:04 -0000	1.108
  @@ -220,7 +220,7 @@
            {
               log.debug("Login successful for: " + getUsername());
            }
  -         Events.instance().raiseEvent(EVENT_LOGIN_SUCCESSFUL);
  +         if (Events.exists()) Events.instance().raiseEvent(EVENT_LOGIN_SUCCESSFUL);
            return "loggedIn";
         }
         catch (LoginException ex)
  @@ -229,7 +229,7 @@
            {
                log.debug("Login failed for: " + getUsername(), ex);
            }
  -         Events.instance().raiseEvent(EVENT_LOGIN_FAILED, ex);
  +         if (Events.exists()) Events.instance().raiseEvent(EVENT_LOGIN_FAILED, ex);
            return null;
         }
      }
  @@ -278,7 +278,7 @@
      {
         unAuthenticate();
         preAuthenticationRoles.clear();
  -      Events.instance().raiseEvent(EVENT_PRE_AUTHENTICATE);
  +      if (Events.exists()) Events.instance().raiseEvent(EVENT_PRE_AUTHENTICATE);
      }   
      
      protected void postAuthenticate()
  @@ -307,7 +307,7 @@
         
         password = null;
   
  -      Events.instance().raiseEvent(EVENT_POST_AUTHENTICATE, this);
  +      if (Events.exists()) Events.instance().raiseEvent(EVENT_POST_AUTHENTICATE, this);
      }
      
      /**
  @@ -346,7 +346,7 @@
         principal = null;
         unAuthenticate();
         Session.instance().invalidate();
  -      Events.instance().raiseEvent(EVENT_LOGGED_OUT);
  +      if (Events.exists()) Events.instance().raiseEvent(EVENT_LOGGED_OUT);
      }
   
      /**
  @@ -550,7 +550,7 @@
         if (this.username != username && (this.username == null || !this.username.equals(username)))
         {
            this.username = username;
  -         Events.instance().raiseEvent(EVENT_CREDENTIALS_UPDATED);
  +         if (Events.exists()) Events.instance().raiseEvent(EVENT_CREDENTIALS_UPDATED);
         }
      }
      
  @@ -564,7 +564,7 @@
         if (this.password != password && (this.password == null || !this.password.equals(password)))
         {
            this.password = password;
  -         Events.instance().raiseEvent(EVENT_CREDENTIALS_UPDATED);
  +         if (Events.exists()) Events.instance().raiseEvent(EVENT_CREDENTIALS_UPDATED);
         }      
      }
      
  @@ -588,7 +588,7 @@
         if (this.rememberMe != remember)
         {
            this.rememberMe = remember;
  -         Events.instance().raiseEvent(EVENT_REMEMBER_ME, this);
  +         if (Events.exists()) Events.instance().raiseEvent(EVENT_REMEMBER_ME, this);
         }
      }