portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r489166 - /portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java
Date Wed, 20 Dec 2006 18:26:49 GMT
Author: taylor
Date: Wed Dec 20 10:26:48 2006
New Revision: 489166

URL: http://svn.apache.org/viewvc?view=rev&rev=489166
Log:
http://issues.apache.org/jira/browse/JS2-633
nested layout broken with permission security enabled

patched by ensuring that the secured fragment list is never null, instead return an empty
list

Modified:
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java?view=diff&rev=489166&r1=489165&r2=489166
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java
(original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java
Wed Dec 20 10:26:48 2006
@@ -682,14 +682,9 @@
             // return filteredFragments fragments if generated
             if (filteredFragments != null)
             {
-                if (!filteredFragments.isEmpty())
-                {
-                    return new FilteredFragmentList(this, filteredFragments);
-                }
-                else
-                {
-                    return null;
-                }
+                // patch for JS2-633, security filtered (permission) lists
+                // were returning null, we need an empty fragment list 
+                return new FilteredFragmentList(this, filteredFragments);
             }
         }
         return fragments;



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


Mime
View raw message