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

[Cedric Mailleux]

cmailleux    2005/11/18 14:50:12 CET

  Modified files:
    core/src/java/org/jahia/hibernate/dao JahiaPagesDAO.java 
  Log:
  Correctly save and merge pages
  
  Revision  Changes    Path
  1.9       +2 -2      
jahia/core/src/java/org/jahia/hibernate/dao/JahiaPagesDAO.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/dao/JahiaPagesDAO.java.diff?r1=1.8&r2=1.9&f=h
  
  
  
  Index: JahiaPagesDAO.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/dao/JahiaPagesDAO.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JahiaPagesDAO.java        10 Nov 2005 17:28:13 -0000      1.8
  +++ JahiaPagesDAO.java        18 Nov 2005 13:50:12 -0000      1.9
  @@ -339,7 +339,7 @@
               synchronized(this) {
                   List list = hibernateTemplate.find("select 
max(pd.comp_id.id) from JahiaPagesData pd");
                   data.getComp_id().setId(new Integer(((Integer) 
list.get(0)).intValue() + 1));
  -                hibernateTemplate.merge(data);
  +                hibernateTemplate.save(data);
               }
           } else {
               hibernateTemplate.merge(data);
  @@ -387,7 +387,7 @@
   
       public void update(JahiaPagesData data) {
           HibernateTemplate hibernateTemplate = getHibernateTemplate();
  -        hibernateTemplate.update(data);
  +        hibernateTemplate.merge(data);
           saveProperties(data, hibernateTemplate);
       }