Author: tdraier
Date: Fri Sep 21 10:47:35 2007
New Revision: 18597

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18597&repname=
=3Djahia
Log:
fixed getJahiaSiteId() call ( port 18417 )

Modified:
    trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java
    trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerListDAO.java

Modified: trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/dao/JahiaContainerDAO.java&rev=3D18597&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/JahiaContainerDAO.java (ori=
ginal)
+++ trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java Fri =
Sep 21 10:47:35 2007
@@ -939,7 +939,7 @@
                     Map.Entry entry =3D (Map.Entry) iterator.next();
                     template.saveOrUpdate(new JahiaContainerProperty(new J=
ahiaContainerPropertyPK(ctn.getComp_id().getId(),
                                                                           =
                        (String) entry.getKey()),
-                                                                 ctn.getCt=
ndef().getJahiaSite().getId(),
+                                                                 ctn.getCt=
ndef().getJahiaSiteId(),
                                                                  (String) =
entry.getValue()));
                 }
                 template.flush();

Modified: trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerListDAO=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/dao/JahiaContainerListDAO.java&rev=3D18597&repname=3Djah=
ia
=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/JahiaContainerListDAO.java =
(original)
+++ trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerListDAO.java =
Fri Sep 21 10:47:35 2007
@@ -771,7 +771,7 @@
                     Map.Entry entry =3D (Map.Entry) iterator.next();
                     template.saveOrUpdate(new JahiaContainerListProperty(n=
ew JahiaContainerListPropertyPK(containerList.getComp_id().getId(),
                                                                           =
                        (String) entry.getKey()),
-                                                                 container=
List.getContainerDefinition().getJahiaSite().getId(),
+                                                                 container=
List.getContainerDefinition().getJahiaSiteId(),
                                                                  (String) =
entry.getValue()));
                 }
                 template.flush();

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

Reply via email to