cvs commit: jahia/src/java/org/jahia/data/containers ContainerFilterBean.java

[Khue Nguyen]

knguyen     2004/09/01 19:18:41 CEST

  Modified files:        (Branch: JAHIA-4-0-BRANCH)
    src/java/org/jahia/data/containers ContainerFilterBean.java 
  Log:
  - fix infinite loop
  
  Revision  Changes    Path
  1.20.4.3  +2 -2      
jahia/src/java/org/jahia/data/containers/ContainerFilterBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/data/containers/ContainerFilterBean.java.diff?r1=1.20.4.2&r2=1.20.4.3&f=h
  
  
  
  Index: ContainerFilterBean.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/data/containers/Attic/ContainerFilterBean.java,v
  retrieving revision 1.20.4.2
  retrieving revision 1.20.4.3
  diff -u -r1.20.4.2 -r1.20.4.3
  --- ContainerFilterBean.java  18 Aug 2004 10:19:04 -0000      1.20.4.2
  +++ ContainerFilterBean.java  1 Sep 2004 17:18:41 -0000       1.20.4.3
  @@ -1533,6 +1533,7 @@
                           result.set(I.intValue());
                       }
                   }
  +                i++;
               }
           }
   
  @@ -1627,12 +1628,11 @@
           if ( siteId != -1 ){
               buff.append(" AND jahiaid_jahia_ctn_entries=");
               buff.append(siteId);
  -            buff.append(" AND ");
           }
   
           if ( containerDefinitionName != null &&
                !"".equals(containerDefinitionName.trim()) ){
  -            buff.append(" ctndefid_jahia_ctn_entries = id_jahia_ctn_def ");
  +            buff.append(" AND ctndefid_jahia_ctn_entries = id_jahia_ctn_def ");
               buff.append(" AND name_jahia_ctn_def='");
               buff.append(JahiaTools.quote(containerDefinitionName));
               buff.append("'");