Author: tdraier
Date: Thu Aug 2 16:11:05 2007
New Revision: 18104
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18104&repname=
=3Djahia
Log:
use update instead of merge
(port 18036)
Modified:
trunk/core/src/java/org/jahia/hibernate/dao/JahiaFieldsDataDAO.java
trunk/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataManager.=
java
Modified: trunk/core/src/java/org/jahia/hibernate/dao/JahiaFieldsDataDAO.ja=
va
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/dao/JahiaFieldsDataDAO.java&rev=3D18104&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/hibernate/dao/JahiaFieldsDataDAO.java (or=
iginal)
+++ trunk/core/src/java/org/jahia/hibernate/dao/JahiaFieldsDataDAO.java Thu=
Aug 2 16:11:05 2007
@@ -943,7 +943,7 @@
final HibernateTemplate hibernateTemplate =3D getHibernateTemplate=
();
hibernateTemplate.setFlushMode(HibernateTemplate.FLUSH_AUTO);
saveProperties(data, hibernateTemplate);
- hibernateTemplate.merge(data);
+ hibernateTemplate.update(data);
hibernateTemplate.flush();
}
=
Modified: trunk/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataMa=
nager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/manager/JahiaFieldsDataManager.java&rev=3D18104&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataManager.=
java (original)
+++ trunk/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataManager.=
java Thu Aug 2 16:11:05 2007
@@ -823,7 +823,10 @@
}
=
public void updateField(JahiaField theField, JahiaSaveVersion saveVers=
ion) {
- JahiaFieldsData data =3D new JahiaFieldsData();
+ JahiaFieldsData data =3D dao.findJahiaFieldsDataByPK(new JahiaFiel=
dsDataPK(new Integer(theField.getID()),
+ new Long(theField.getVersionID()),
+ new Integer(theField.getWorkflowState()),
+ theField.getLanguageCode()));
data.setConnectType(new Integer(theField.getConnectType()));
data.setContainerId(new Integer(theField.getctnid()));
final JahiaFieldsDef fieldDefinition =3D definitionDAO.loadDefinit=
ion(new Integer(theField.getFieldDefID()));
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
