cvs commit: jahia/core/src/java/org/jahia/hibernate/dao JahiaContainerDAO.java jahia/core/src/java/org/jahia/hibernate/manager JahiaAuditLogManager.java

[Cedric Mailleux]

cmailleux    2005/08/03 14:37:21 CEST

  Modified files:
    core/src/java/org/jahia/hibernate/dao JahiaContainerDAO.java 
    core/src/java/org/jahia/hibernate/manager 
                                              JahiaAuditLogManager.java 
  Log:
  Correct bugs for logs
  
  Revision  Changes    Path
  1.7       +1 -6      
jahia/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java.diff?r1=1.6&r2=1.7&f=h
  1.5       +8 -2      
jahia/core/src/java/org/jahia/hibernate/manager/JahiaAuditLogManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/JahiaAuditLogManager.java.diff?r1=1.4&r2=1.5&f=h
  
  
  
  Index: JahiaContainerDAO.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JahiaContainerDAO.java    3 Aug 2005 12:10:27 -0000       1.6
  +++ JahiaContainerDAO.java    3 Aug 2005 12:37:20 -0000       1.7
  @@ -379,12 +379,7 @@
           if (listId != null) {
               final HibernateTemplate template = getHibernateTemplate();
               template.setCacheQueries(true);
  -            List list = template.find(hql.toString(), new Object[]{listId});
  -            retVal = new FastArrayList(list.size());
  -            for (int i = 0; i < list.size(); i++) {
  -                Object[] objects = (Object[]) list.get(i);
  -                retVal.add(objects[0]);
  -            }
  +            retVal = template.find(hql.toString(), new Object[]{listId});    
        
           }
           return retVal;
       }
  
  
  
  Index: JahiaAuditLogManager.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaAuditLogManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JahiaAuditLogManager.java 3 Aug 2005 12:10:28 -0000       1.4
  +++ JahiaAuditLogManager.java 3 Aug 2005 12:37:20 -0000       1.5
  @@ -125,10 +125,16 @@
   
       private void fillListWithArrayOfIntegers(List list, Integer integer, 
List retList) {
           for (int i = 0; i < list.size(); i++) {
  -            Integer objects = (Integer) list.get(i);
  +            Integer id;
  +            if(list.get(i) instanceof Integer) {
  +            id = (Integer) list.get(i);
  +            } else {
  +                Object[] objects = (Object[]) list.get(i);
  +                id = (Integer) objects[0];
  +            }
               Integer[] child = new Integer[2];
               child[0] = integer;
  -            child[1] = objects;
  +            child[1] = id;
               if (!retList.contains(child)) {
                   retList.add(child);
               }