cvs commit: jahia/core/src/java/org/jahia/services/webdav/listeners CMSSlideContentListener.java

[Serge Huber]

shuber      2005/02/15 14:12:20 CET

  Modified files:
    core/src/java/org/jahia/services/webdav/listeners 
                                                      
CMSSlideContentListener.java 
  Log:
  Improved error handling when pages don't exist or can't be found.
  
  Revision  Changes    Path
  1.9       +15 -4     
jahia/core/src/java/org/jahia/services/webdav/listeners/CMSSlideContentListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/webdav/listeners/CMSSlideContentListener.java.diff?r1=1.8&r2=1.9&f=h
  
  
  
  Index: CMSSlideContentListener.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/webdav/listeners/CMSSlideContentListener.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CMSSlideContentListener.java      15 Feb 2005 10:45:42 -0000      1.8
  +++ CMSSlideContentListener.java      15 Feb 2005 13:12:20 -0000      1.9
  @@ -41,6 +41,7 @@
   import org.apache.slide.content.NodeRevisionDescriptor;
   import org.jahia.services.webdav.DAVFileAccess;
   import org.jahia.services.webdav.JahiaWebdavBaseService;
  +import org.jahia.exceptions.JahiaPageNotFoundException;
   
   /**
    * Created by IntelliJ IDEA.
  @@ -49,10 +50,10 @@
    * Time: 15:23:17
    * <p/>
    * $Author: shuber $
  - * $Date: 2005/02/15 10:45:42 $
  - * $Id: CMSSlideContentListener.java,v 1.8 2005/02/15 10:45:42 shuber Exp $
  + * $Date: 2005/02/15 13:12:20 $
  + * $Id: CMSSlideContentListener.java,v 1.9 2005/02/15 13:12:20 shuber Exp $
    * $RCSfile: CMSSlideContentListener.java,v $
  - * $Revision: 1.8 $
  + * $Revision: 1.9 $
    * $Source: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/webdav/listeners/CMSSlideContentListener.java,v
 $
    * $State: Exp $
    */
  @@ -132,6 +133,10 @@
   
               JahiaPage curPage = findPageInHierarchy(pageId, jParams,
                   relativeFileName, false);
  +            if (curPage == null) {
  +                logger.debug("Couldn't find page " + pageId + " in current 
language " + jParams.getLocale());
  +                return;
  +            }
   
               if (WebdavUtils.isCollection(event.getRevisionDescriptor())) {
                   logger.debug("URI is a collection, let's create a page for 
it");
  @@ -170,7 +175,13 @@
           JahiaPageService pageService = ServicesRegistry.getInstance().
                                          getJahiaPageService();
   
  -        JahiaPage curPage = pageService.lookupPage(pageId, jParams);
  +
  +        JahiaPage curPage = null;
  +        try {
  +            curPage = pageService.lookupPage(pageId, jParams);
  +        } catch (JahiaPageNotFoundException jpnfe) {
  +            curPage = null;
  +        }
           if (curPage == null) {
               logger.warn("Couldn't find start page "+pageId+" for hierarchy");
               return null;