cmailleux 2005/07/13 13:33:01 CEST
Modified files:
core/src/java/org/jahia/hibernate/dao
JahiaApplicationDefinitionDAO.java
JahiaApplicationEntryDAO.java
core/src/java/org/jahia/hibernate/manager
JahiaApplicationEntryManager.java
JahiaApplicationManager.java
Log:
Correct bug if object does not exist in database (hibernate3 lazy initialized
pb)
Revision Changes Path
1.4 +1 -2
jahia/core/src/java/org/jahia/hibernate/dao/JahiaApplicationDefinitionDAO.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/dao/JahiaApplicationDefinitionDAO.java.diff?r1=1.3&r2=1.4&f=h
1.4 +1 -1
jahia/core/src/java/org/jahia/hibernate/dao/JahiaApplicationEntryDAO.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/dao/JahiaApplicationEntryDAO.java.diff?r1=1.3&r2=1.4&f=h
1.3 +2 -1
jahia/core/src/java/org/jahia/hibernate/manager/JahiaApplicationEntryManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/JahiaApplicationEntryManager.java.diff?r1=1.2&r2=1.3&f=h
1.3 +1 -0
jahia/core/src/java/org/jahia/hibernate/manager/JahiaApplicationManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/JahiaApplicationManager.java.diff?r1=1.2&r2=1.3&f=h
Index: JahiaApplicationDefinitionDAO.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/dao/JahiaApplicationDefinitionDAO.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaApplicationDefinitionDAO.java 12 Jul 2005 13:52:52 -0000
1.3
+++ JahiaApplicationDefinitionDAO.java 13 Jul 2005 11:33:00 -0000
1.4
@@ -3,7 +3,6 @@
*/
package org.jahia.hibernate.dao;
-import org.hibernate.type.TypeFactory;
import org.jahia.hibernate.model.JahiaAppDef;
import org.springframework.orm.hibernate3.HibernateTemplate;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
@@ -21,7 +20,7 @@
public JahiaAppDef loadApplicationDefinition(Integer definitionId) {
HibernateTemplate template = getHibernateTemplate();
template.setCacheQueries(true);
- return (JahiaAppDef) template.load(JahiaAppDef.class, definitionId);
+ return (JahiaAppDef) template.get(JahiaAppDef.class, definitionId);
}
public List getSiteIds() {
Index: JahiaApplicationEntryDAO.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/dao/JahiaApplicationEntryDAO.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaApplicationEntryDAO.java 12 Jul 2005 13:52:52 -0000 1.3
+++ JahiaApplicationEntryDAO.java 13 Jul 2005 11:33:00 -0000 1.4
@@ -18,7 +18,7 @@
public JahiaAppentry getEntryPointInstanceByID(Integer entryId) {
final HibernateTemplate template = getHibernateTemplate();
template.setCacheQueries(true);
- return (JahiaAppentry) template.load(JahiaAppentry.class,entryId);
+ return (JahiaAppentry) template.get(JahiaAppentry.class,entryId);
}
public void save(JahiaAppentry jahiaAppentry) {
Index: JahiaApplicationEntryManager.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaApplicationEntryManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JahiaApplicationEntryManager.java 22 Jun 2005 12:37:31 -0000 1.2
+++ JahiaApplicationEntryManager.java 13 Jul 2005 11:33:00 -0000 1.3
@@ -30,7 +30,8 @@
EntryPointInstance instance = null;
try {
JahiaAppentry jahiaAppentry = dao.getEntryPointInstanceByID(new
Integer(entryPointID));
- instance = new
EntryPointInstance(entryPointID,jahiaAppentry.getApplicationId().intValue(),jahiaAppentry.getDefinitionName());
+ if(jahiaAppentry != null)
+ instance = new
EntryPointInstance(entryPointID,jahiaAppentry.getApplicationId().intValue(),jahiaAppentry.getDefinitionName());
} catch(ObjectRetrievalFailureException e) {
log.warn("Application entry not found for id "+entryPointID, e);
}
Index: JahiaApplicationManager.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaApplicationManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JahiaApplicationManager.java 22 Jun 2005 12:37:31 -0000 1.2
+++ JahiaApplicationManager.java 13 Jul 2005 11:33:00 -0000 1.3
@@ -50,6 +50,7 @@
ApplicationBean applicationBean = null;
try {
JahiaAppDef appDef = dao.loadApplicationDefinition(new
Integer(appID));
+ if(appDef!=null)
applicationBean = convertJahiaAppDefToApplicationBean(appDef);
} catch (ObjectRetrievalFailureException e) {
log.warn("Could not found application for id " + appID, e);
