cvs commit: jahia/core/src/java/org/jahia/ajax/monitors PDisplayAction.java

[Xavier Lawrence]

xlawrence    2005/12/09 11:26:27 CET

  Modified files:
    core/src/java/org/jahia/ajax/monitors PDisplayAction.java 
  Log:
  - Corrected If statement
  - Avoid NPE in case currentUser or site is null
  
  Revision  Changes    Path
  1.2       +6 -13     
jahia/core/src/java/org/jahia/ajax/monitors/PDisplayAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/ajax/monitors/PDisplayAction.java.diff?r1=1.1&r2=1.2&f=h
  
  
  
  Index: PDisplayAction.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/ajax/monitors/PDisplayAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PDisplayAction.java       8 Dec 2005 18:02:05 -0000       1.1
  +++ PDisplayAction.java       9 Dec 2005 10:26:27 -0000       1.2
  @@ -5,25 +5,18 @@
   import org.apache.struts.action.ActionForward;
   import org.apache.struts.action.ActionMapping;
   import org.jahia.ajax.AjaxAction;
  -import org.jahia.hibernate.manager.SpringContextSingleton;
  -import org.jahia.params.ProcessingContext;
  -import org.jahia.params.ProcessingContextFactory;
  +import org.jahia.exceptions.JahiaException;
   import org.jahia.params.ParamBean;
   import org.jahia.registries.ServicesRegistry;
  -import org.jahia.services.acl.JahiaBaseACL;
  -import org.jahia.services.pages.JahiaPage;
  -import org.jahia.services.usermanager.JahiaUser;
  -import org.jahia.services.sites.JahiaSite;
   import org.jahia.services.scheduler.SchedulerService;
  -import org.jahia.exceptions.JahiaException;
  -import org.springframework.beans.factory.BeanFactory;
  +import org.jahia.services.sites.JahiaSite;
  +import org.jahia.services.usermanager.JahiaUser;
   import org.quartz.Scheduler;
   
   import javax.servlet.ServletException;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
   import java.io.IOException;
  -import java.util.Enumeration;
   import java.util.Iterator;
   import java.util.List;
   import java.util.Vector;
  @@ -35,7 +28,7 @@
    *
    *
    * @author joepi
  - * @version $Id: PDisplayAction.java,v 1.1 2005/12/08 18:02:05 dpillot Exp $
  + * @version $Id: PDisplayAction.java,v 1.2 2005/12/09 10:26:27 xlawrence Exp 
$
    */
   public class PDisplayAction extends AjaxAction {
   
  @@ -65,10 +58,10 @@
               final JahiaUser currentUser = 
(JahiaUser)request.getSession().getAttribute(ParamBean.SESSION_USER);
               final JahiaSite site = (JahiaSite) 
request.getSession().getAttribute("org.jahia.services.sites.jahiasite");
   
  -            if (currentUser == null && site==null && (!currentUser.isRoot() 
|| !currentUser.isAdminMember(site.getID()))) {
  +            if (currentUser == null || site == null || !currentUser.isRoot() 
|| !currentUser.isAdminMember(site.getID())){
                   logger.warn("Unauthorized attempt to use AJAX Struts Action 
- Process display");
                   response.sendError(HttpServletResponse.SC_FORBIDDEN,
  -                        "Error: Must be logged in and have 'Write' access");
  +                        "Error: Must be logged in and have 'Admin' access");
                   return null;
               }