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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/10/03 21:54:40

  Modified:    src/main/org/jboss/seam/security  Identity.java
  Log:
  JBSEAM-2029
  
  Revision  Changes    Path
  1.98      +10 -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.97
  retrieving revision 1.98
  diff -u -b -r1.97 -r1.98
  --- Identity.java	31 Jul 2007 11:29:42 -0000	1.97
  +++ Identity.java	4 Oct 2007 01:54:40 -0000	1.98
  @@ -42,6 +42,7 @@
   import org.jboss.seam.faces.Selector;
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
  +import org.jboss.seam.persistence.PersistenceProvider;
   import org.jboss.seam.util.Strings;
   import org.jboss.seam.web.Session;
   
  @@ -169,7 +170,7 @@
      
      public boolean isLoggedIn()
      {           
  -      return isLoggedIn(false);
  +      return isLoggedIn(true);
      }
      
      public boolean isLoggedIn(boolean attemptLogin)
  @@ -662,27 +663,28 @@
      {      
         isLoggedIn(true);
         
  -      Entity e = Entity.forClass(entity.getClass());
  +      PersistenceProvider provider = PersistenceProvider.instance(); 
  +      Class beanClass = provider.getBeanClass(entity);
         
  -      if (e != null)
  +      if (beanClass != null)
         {
            String name = Seam.getComponentName(entity.getClass());
  -         if (name == null) name = e.getBeanClass().getName();  
  +         if (name == null) name = beanClass.getName();  
            
            Method m = null;
            switch (action)
            {
               case READ:
  -               m = e.getPostLoadMethod();
  +               m = provider.getPostLoadMethod(beanClass);
                  break;
               case INSERT:
  -               m = e.getPrePersistMethod();
  +               m = provider.getPrePersistMethod(beanClass);
                  break;
               case UPDATE:
  -               m = e.getPreUpdateMethod();
  +               m = provider.getPreUpdateMethod(beanClass);
                  break;
               case DELETE:
  -               m = e.getPreRemoveMethod();
  +               m = provider.getPreRemoveMethod(beanClass);
            }
            
            Restrict restrict = null;