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

[Gavin King]

  User: gavin   
  Date: 07/06/18 11:53:55

  Modified:    src/main/org/jboss/seam/contexts  PassivatedEntity.java
  Log:
  fix npes
  
  Revision  Changes    Path
  1.12      +3 -12     jboss-seam/src/main/org/jboss/seam/contexts/PassivatedEntity.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PassivatedEntity.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/PassivatedEntity.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- PassivatedEntity.java	18 Jun 2007 05:57:35 -0000	1.11
  +++ PassivatedEntity.java	18 Jun 2007 15:53:55 -0000	1.12
  @@ -5,12 +5,11 @@
   import javax.persistence.EntityManager;
   import javax.persistence.OptimisticLockException;
   
  -import org.hibernate.EntityMode;
   import org.hibernate.Session;
  -import org.hibernate.metadata.ClassMetadata;
   import org.jboss.seam.Component;
   import org.jboss.seam.Seam;
   import org.jboss.seam.core.PersistenceContexts;
  +import org.jboss.seam.persistence.HibernatePersistenceProvider;
   import org.jboss.seam.persistence.PersistenceProvider;
   import org.jboss.seam.transaction.Transaction;
   
  @@ -88,7 +87,7 @@
                  result = session.load( getEntityClass(), (Serializable) getId() );
                  if (result!=null)
                  {
  -                  version = getVersion(result, session);
  +                  version = HibernatePersistenceProvider.getVersion(result, session);
                  }
               }
            }
  @@ -145,7 +144,7 @@
                  if (managed)
                  {
                     id = session.getIdentifier(value);
  -                  version = getVersion(value, session);
  +                  version = HibernatePersistenceProvider.getVersion(value, session);
                  }
               }
               if (managed)
  @@ -165,14 +164,6 @@
         return null;
      }
   
  -   private static Object getVersion(Object value, Session session)
  -   {
  -      ClassMetadata classMetadata = session.getSessionFactory()
  -                  .getClassMetadata( value.getClass() );
  -      return classMetadata.isVersioned() ? 
  -               classMetadata.getVersion(value, EntityMode.POJO) : null;
  -   }
  -   
      public static boolean isTransactionRolledBackOrMarkedRollback()
      {
         try