cvs commit: jahia/core/src/java/org/jahia/hibernate/dao JahiaUserDAO.java

[Cedric Mailleux]

cmailleux    2005/12/09 17:44:28 CET

  Modified files:
    core/src/java/org/jahia/hibernate/dao JahiaUserDAO.java 
  Log:
  Use merge
  
  Revision  Changes    Path
  1.11      +2 -3      
jahia/core/src/java/org/jahia/hibernate/dao/JahiaUserDAO.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/dao/JahiaUserDAO.java.diff?r1=1.10&r2=1.11&f=h
  
  
  
  Index: JahiaUserDAO.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/dao/JahiaUserDAO.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JahiaUserDAO.java 23 Nov 2005 17:44:10 -0000      1.10
  +++ JahiaUserDAO.java 9 Dec 2005 16:44:27 -0000       1.11
  @@ -7,7 +7,6 @@
   import org.jahia.services.usermanager.JahiaUserManagerDBProvider;
   import org.springframework.orm.ObjectRetrievalFailureException;
   import org.springframework.orm.hibernate3.HibernateTemplate;
  -import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
   
   import java.util.*;
   
  @@ -254,7 +253,7 @@
       }
   
       public void update(JahiaUser jahiaUser) {
  -        getHibernateTemplate().update(jahiaUser);
  +        getHibernateTemplate().merge(jahiaUser);
       }
   
       public void saveProperty(JahiaUserProp prop) {
  @@ -262,7 +261,7 @@
       }
   
       public void updateProperty(JahiaUserProp prop) {
  -        getHibernateTemplate().update(prop);
  +        getHibernateTemplate().merge(prop);
       }
   
       public void addMemberToSite(JahiaSitesUser jahiaSitesUser) {