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

[Cedric Mailleux]

cmailleux    2005/12/05 13:10:17 CET

  Modified files:
    core/src/java/org/jahia/hibernate/dao JahiaContainerDAO.java 
  Log:
  Ensure distinct
  
  Revision  Changes    Path
  1.16      +3 -3      
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.15&r2=1.16&f=h
  
  
  
  Index: JahiaContainerDAO.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- JahiaContainerDAO.java    24 Nov 2005 16:11:48 -0000      1.15
  +++ JahiaContainerDAO.java    5 Dec 2005 12:10:17 -0000       1.16
  @@ -13,15 +13,14 @@
   import org.hibernate.criterion.Expression;
   import org.hibernate.criterion.Projections;
   import org.hibernate.criterion.Property;
  +import org.jahia.content.ContentContainerKey;
   import org.jahia.hibernate.model.JahiaContainer;
   import org.jahia.hibernate.model.JahiaContainerProperty;
   import org.jahia.hibernate.model.JahiaContainerPropertyPK;
   import org.jahia.hibernate.model.JahiaCtnEntryPK;
  -import org.jahia.content.ContentContainerKey;
   import org.springframework.orm.ObjectRetrievalFailureException;
   import org.springframework.orm.hibernate3.HibernateCallback;
   import org.springframework.orm.hibernate3.HibernateTemplate;
  -import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
   
   import java.sql.SQLException;
   import java.util.*;
  @@ -300,7 +299,8 @@
           retVal=new FastArrayList(list.size());
           for (int i = 0; i < list.size(); i++) {
               Object[] objects = (Object[]) list.get(i);
  -            retVal.add(objects[0]);
  +            if(!retVal.contains(objects[0]))
  +                retVal.add(objects[0]);
           }
           return retVal;
       }