portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl PageAggregatorImpl.java
Date Fri, 15 Oct 2004 07:05:27 GMT
taylor      2004/10/15 00:05:27

  Modified:    portal/src/java/org/apache/jetspeed/aggregator/impl
                        PageAggregatorImpl.java
  Log:
  npe check
  
  Revision  Changes    Path
  1.14      +2 -2      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
  
  Index: PageAggregatorImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- PageAggregatorImpl.java	2 Sep 2004 21:23:48 -0000	1.13
  +++ PageAggregatorImpl.java	15 Oct 2004 07:05:27 -0000	1.14
  @@ -157,7 +157,7 @@
               if (null != window)
               {
                   Fragment fragment = page.getFragmentById(window.getId().toString());
  -                if (checkAccess(context, (fragment.getAcl() != null) ? fragment.getAcl()
: acl, "render"))
  +                if (fragment != null && checkAccess(context, (fragment.getAcl()
!= null) ? fragment.getAcl() : acl, "render"))
                   {
                       context.getRequest().setAttribute("org.apache.jetspeed.maximized.Fragment",
fragment);
                       context.getRequest().setAttribute("org.apache.jetspeed.maximized.Layout",
page.getRootFragment());
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message