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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/02/13 05:17:15

  Modified:    src/main/org/jboss/seam/security  Identity.java
  Log:
  JBSEAM-838
  
  Revision  Changes    Path
  1.61      +27 -2     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.60
  retrieving revision 1.61
  diff -u -b -r1.60 -r1.61
  --- Identity.java	13 Feb 2007 07:20:11 -0000	1.60
  +++ Identity.java	13 Feb 2007 10:17:15 -0000	1.61
  @@ -25,6 +25,7 @@
   
   import org.drools.FactHandle;
   import org.drools.RuleBase;
  +import org.drools.RuleBaseFactory;
   import org.drools.WorkingMemory;
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
  @@ -109,12 +110,32 @@
         {
            securityRules = (RuleBase) Component.getInstance(RULES_COMPONENT_NAME, true);
         }
  +      
  +      if (securityRules == null)
  +      {
  +         log.warn("No securityRules component found, creating empty rule base.");
  +         createDefaultSecurityRules();         
  +      }
  +      
         if (securityRules != null)
         {
            securityContext = securityRules.newWorkingMemory(false);
         }
      }
   
  +   private synchronized void createDefaultSecurityRules()
  +   {
  +      if (Contexts.getApplicationContext().get(RULES_COMPONENT_NAME) == null)
  +      {
  +         securityRules = RuleBaseFactory.newRuleBase();         
  +         Contexts.getApplicationContext().set(RULES_COMPONENT_NAME, securityRules);
  +      }
  +      else
  +      {
  +         securityRules = (RuleBase) Contexts.getApplicationContext().get(RULES_COMPONENT_NAME);
  +      }
  +   }
  +
      public static Identity instance()
      {
         if ( !Contexts.isSessionContextActive() )
  @@ -204,12 +225,16 @@
   
      protected void addLoginFailedMessage(LoginException ex)
      {
  -      FacesMessages.instance().addFromResourceBundleOrDefault(FacesMessage.SEVERITY_INFO, "org.jboss.seam.loginFailed", "Login failed", ex);
  +      FacesMessages.instance().addFromResourceBundleOrDefault(
  +               FacesMessage.SEVERITY_INFO, "org.jboss.seam.loginFailed", 
  +               "Login failed", ex);
      }
   
      protected void addLoginSuccessfulMessage()
      {
  -      FacesMessages.instance().addFromResourceBundleOrDefault(FacesMessage.SEVERITY_INFO, "org.jboss.seam.loginSuccessful", "Welcome, #0", getUsername());
  +      FacesMessages.instance().addFromResourceBundleOrDefault(
  +               FacesMessage.SEVERITY_INFO, "org.jboss.seam.loginSuccessful", 
  +               "Welcome, #0", getUsername());
      }
      
      public void authenticate() throws LoginException