cvs commit: jahia/core/src/java/org/jahia/engines EngineRenderer.java

[Thomas Draier]

tdraier     2005/09/27 12:19:02 CEST

  Modified files:
    core/src/java/org/jahia/engines EngineRenderer.java 
  Log:
  fixed  login issue (JAHIA-376)
  
  Revision  Changes    Path
  1.6       +4 -2      jahia/core/src/java/org/jahia/engines/EngineRenderer.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/EngineRenderer.java.diff?r1=1.5&r2=1.6&f=h
  
  
  
  Index: EngineRenderer.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/EngineRenderer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- EngineRenderer.java       5 Jul 2005 15:46:08 -0000       1.5
  +++ EngineRenderer.java       27 Sep 2005 10:19:01 -0000      1.6
  @@ -129,8 +129,10 @@
               jParams.getRequest ().setAttribute 
("org.jahia.params.ParamBean", jParams);
   
               // now let's set the content access beans.
  -            jParams.getRequest ().setAttribute ("currentPage",
  -                    new PageBean (jParams.getPage (), jParams));
  +            if (jParams.getPage()!=null) {
  +                jParams.getRequest ().setAttribute ("currentPage",
  +                        new PageBean (jParams.getPage (), jParams));
  +            }
               jParams.getRequest ().setAttribute ("currentSite",
                       new SiteBean (jParams.getSite (), jParams));
               jParams.getRequest ().setAttribute ("currentJahia", new 
JahiaBean (jParams));