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

[Gavin King]

  User: gavin   
  Date: 07/02/16 23:08:02

  Modified:    src/main/org/jboss/seam/security   Identity.java
                        RuleBasedIdentity.java
  Log:
  if the overriding component does not have its dependencies met, install the lower precedence version
  
  Revision  Changes    Path
  1.65      +1 -1      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.64
  retrieving revision 1.65
  diff -u -b -r1.64 -r1.65
  --- Identity.java	14 Feb 2007 12:39:58 -0000	1.64
  +++ Identity.java	17 Feb 2007 04:08:02 -0000	1.65
  @@ -105,7 +105,7 @@
            throw new IllegalStateException("No active session context");
         }
   
  -      Identity instance = (Identity) Component.getInstance(Identity.class, ScopeType.SESSION, true);
  +      Identity instance = (Identity) Component.getInstance(Identity.class, ScopeType.SESSION);
   
         if (instance == null)
         {
  
  
  
  1.2       +0 -1      jboss-seam/src/main/org/jboss/seam/security/RuleBasedIdentity.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RuleBasedIdentity.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/RuleBasedIdentity.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- RuleBasedIdentity.java	15 Feb 2007 02:48:20 -0000	1.1
  +++ RuleBasedIdentity.java	17 Feb 2007 04:08:02 -0000	1.2
  @@ -15,7 +15,6 @@
   import org.drools.RuleBase;
   import org.drools.WorkingMemory;
   import org.jboss.seam.Component;
  -import org.jboss.seam.annotations.In;
   import org.jboss.seam.annotations.Install;
   import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;