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

[Xavier Lawrence]

xlawrence    2005/07/29 14:33:33 CEST

  Modified files:
    core/src/java/org/jahia/hibernate/dao 
                                          JahiaSitePropertyDAO.java 
  Log:
  changed logger
  
  Revision  Changes    Path
  1.4       +5 -3      
jahia/core/src/java/org/jahia/hibernate/dao/JahiaSitePropertyDAO.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/dao/JahiaSitePropertyDAO.java.diff?r1=1.3&r2=1.4&f=h
  
  
  
  Index: JahiaSitePropertyDAO.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/dao/JahiaSitePropertyDAO.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JahiaSitePropertyDAO.java 12 Jul 2005 13:52:52 -0000      1.3
  +++ JahiaSitePropertyDAO.java 29 Jul 2005 12:33:33 -0000      1.4
  @@ -5,8 +5,6 @@
   
   import org.hibernate.type.Type;
   import org.hibernate.type.TypeFactory;
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
   import org.jahia.hibernate.model.JahiaSite;
   import org.jahia.hibernate.model.JahiaSiteProp;
   import org.springframework.orm.ObjectRetrievalFailureException;
  @@ -25,7 +23,8 @@
   public class JahiaSitePropertyDAO extends HibernateDaoSupport {
   // ------------------------------ FIELDS ------------------------------
   
  -    private Log log = LogFactory.getLog(JahiaSitePropertyDAO.class);
  +    private static final org.apache.log4j.Logger log =
  +            org.apache.log4j.Logger.getLogger (JahiaSitePropertyDAO.class);
   
   // -------------------------- OTHER METHODS --------------------------
   
  @@ -33,6 +32,7 @@
           List retval = null;
           String hql = "from JahiaSiteProp aTable WHERE aTable.comp_id.id = ?";
           if (id == null) {
  +            log.error("Error: Cannot use null in query");
               throw new RuntimeException("Error: Cannot use null in query");
           } else {
               final HibernateTemplate template = getHibernateTemplate();
  @@ -46,6 +46,7 @@
           JahiaSiteProp retval = null;
           String hql = "from JahiaSiteProp aTable WHERE aTable.comp_id.id = ? 
and aTable.comp_id.name = ?";
           if (id == null || name == null) {
  +            log.error("Error: Cannot use null in query for unique column");
               throw new RuntimeException("Error: Cannot use null in query for 
unique column");
           } else {
               final HibernateTemplate template = getHibernateTemplate();
  @@ -54,6 +55,7 @@
               if (objects.size() == 1) {
                   retval = (JahiaSiteProp) objects.get(0);
               } else if (objects.size() > 1) {
  +                log.error("Error: multiple values returned for unique 
column:" + objects);
                   throw new RuntimeException("Error: multiple values returned 
for unique column:" + objects);
               } else {
                   throw new 
ObjectRetrievalFailureException(JahiaSiteProp.class, id + ", " + name);