knguyen 2005/04/20 11:37:55 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/data/beans PageBean.java SiteBean.java
Log:
- Perf issue with Beans Objects: avoid to fully load container list if not
needed. Should use JahiaContainerService.loadContainerList(...) instead of
directly call ContainerFactory.fullyLoadContainerList(...)
Revision Changes Path
1.19.6.1 +2 -3 jahia/src/java/org/jahia/data/beans/PageBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/data/beans/PageBean.java.diff?r1=1.19&r2=1.19.6.1&f=h
1.8.4.1 +3 -3 jahia/src/java/org/jahia/data/beans/SiteBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/data/beans/SiteBean.java.diff?r1=1.8&r2=1.8.4.1&f=h
Index: PageBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/data/beans/Attic/PageBean.java,v
retrieving revision 1.19
retrieving revision 1.19.6.1
diff -u -r1.19 -r1.19.6.1
--- PageBean.java 8 Sep 2003 17:42:49 -0000 1.19
+++ PageBean.java 20 Apr 2005 09:37:55 -0000 1.19.6.1
@@ -131,12 +131,11 @@
getJahiaContainersService().
getAllPageTopLevelContainerListIDs(
getId(), paramBean.getEntryLoadRequest());
- ContainerFactory containerFactory =
ContainerFactory.getInstance();
Iterator containerListIDIter = containerListIDs.iterator();
while (containerListIDIter.hasNext()) {
Integer curContainerListID = (Integer)
containerListIDIter.next();
- JahiaContainerList curContainerList = containerFactory.
- fullyLoadContainerList(curContainerListID.intValue(),
+ JahiaContainerList curContainerList =
ServicesRegistry.getInstance().getJahiaContainersService()
+ .loadContainerList(curContainerListID.intValue(),
LoadFlags.ALL, paramBean,
paramBean.getEntryLoadRequest(),
null, null, null);
ContainerListBean containerListBean = new ContainerListBean(
Index: SiteBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/data/beans/Attic/SiteBean.java,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -u -r1.8 -r1.8.4.1
--- SiteBean.java 22 Jan 2004 18:08:33 -0000 1.8
+++ SiteBean.java 20 Apr 2005 09:37:55 -0000 1.8.4.1
@@ -112,12 +112,12 @@
getJahiaContainersService().
getSiteTopLevelContainerListsIDsByName(
getId(), name, paramBean.getEntryLoadRequest());
- ContainerFactory containerFactory =
ContainerFactory.getInstance();
Iterator containerListIDIter = containerListIDs.iterator();
while (containerListIDIter.hasNext()) {
Integer curContainerListID = (Integer)
containerListIDIter.next();
- JahiaContainerList curContainerList =
containerFactory.fullyLoadContainerList(curContainerListID.intValue(),
- LoadFlags.ALL, paramBean,
paramBean.getEntryLoadRequest(), null, null, null);
+ JahiaContainerList curContainerList =
ServicesRegistry.getInstance().getJahiaContainersService()
+ .loadContainerList(curContainerListID.intValue(),
LoadFlags.ALL, paramBean,
+ paramBean.getEntryLoadRequest(), null, null,
null);
ContainerListBean containerListBean = new
ContainerListBean(curContainerList, paramBean);
containerLists.add(containerListBean);
}
