cvs commit: jahia/core/src/java/org/jahia/data/beans ContainerBean.java

[Dominique Pillot]

dpillot     2005/11/21 16:25:31 CET

  Modified files:
    core/src/java/org/jahia/data/beans ContainerBean.java 
  Log:
  fix npe jira 535
  
  Revision  Changes    Path
  1.23      +14 -1     
jahia/core/src/java/org/jahia/data/beans/ContainerBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/data/beans/ContainerBean.java.diff?r1=1.22&r2=1.23&f=h
  
  
  
  Index: ContainerBean.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/data/beans/ContainerBean.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- ContainerBean.java        15 Nov 2005 17:13:54 -0000      1.22
  +++ ContainerBean.java        21 Nov 2005 15:25:31 -0000      1.23
  @@ -25,6 +25,7 @@
   import org.jahia.services.version.EntryLoadRequest;
   import org.jahia.services.fields.ContentField;
   import org.jahia.services.fields.ContentPageField;
  +import org.jahia.services.pages.JahiaPage;
   import org.jahia.utils.InsertionSortedMap;
   import org.jahia.bin.Jahia;
   
  @@ -37,7 +38,7 @@
    * <p>Copyright: Copyright (c) 2002</p>
    * <p>Company: Jahia Ltd</p>
    * @author Serge Huber, Xavier Lawrence
  - * @version $Id: ContainerBean.java,v 1.22 2005/11/15 17:13:54 dpillot Exp $
  + * @version $Id: ContainerBean.java,v 1.23 2005/11/21 15:25:31 dpillot Exp $
    */
   
   public class ContainerBean extends ContentBean implements 
PropertiesInterface {
  @@ -451,9 +452,18 @@
                   for (Iterator iterator1 = l.iterator(); 
iterator1.hasNext();) {
                       Object o=iterator1.next();
                       if(!(o instanceof ContentPageField)) continue;
  +                    //defensive code relative to poor impl of exception 
catching/throwing of method getPage below
  +
  +                    JahiaPage page=((ContentPageField) 
o).getPage(processingContext, processingContext.getEntryLoadRequest());
  +                    logger.debug(""+page.toString());
  +                    if(page!=null){
                       pickedpageID=""+((ContentPageField) 
o).getPage(processingContext, processingContext.getEntryLoadRequest()).getID();
                       logger.debug("found contentpagefield:"+pickedpageID);
                       break;
  +                    } else {
  +                    logger.warn("found inconsistent pid");
  +                    pickedpageID=""+0;
  +                    }
                   }
                   curURL="document.location='"
                           + Jahia.getContextPath()
  @@ -575,6 +585,9 @@
   }
       /**
        * $Log: ContainerBean.java,v $
  +     * Revision 1.23  2005/11/21 15:25:31  dpillot
  +     * fix npe jira 535
  +     *
        * Revision 1.22  2005/11/15 17:13:54  dpillot
        * cosmetic pickers/picked
        *