Author: woonsan
Date: Tue Mar 9 16:18:33 2010
New Revision: 920957
URL: http://svn.apache.org/viewvc?rev=920957&view=rev
Log:
JS2-1057: Excluding ordinary folders when finding space folders.
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/spaces/SpacesServiceImpl.java
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/spaces/SpacesServiceImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/spaces/SpacesServiceImpl.java?rev=920957&r1=920956&r2=920957&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/spaces/SpacesServiceImpl.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/spaces/SpacesServiceImpl.java
Tue Mar 9 16:18:33 2010
@@ -155,7 +155,11 @@ public class SpacesServiceImpl implement
if (folder.isHidden() || folder.isReserved())
continue;
Space space = loadSpace(folder);
- result.add(space);
+ // Exclude ordinary folders
+ if (space.getOwner() != null)
+ {
+ result.add(space);
+ }
}
}
catch (Exception e)
@@ -191,7 +195,12 @@ public class SpacesServiceImpl implement
Folder folder = pageManager.getFolder(spacePath);
if (folder.isHidden() || folder.isReserved())
continue;
- result.add(loadSpace(folder));
+ Space space = loadSpace(folder);
+ // Exclude ordinary folders which is neither the root folder
nor the user home root folder.
+ if (space.getOwner() != null)
+ {
+ result.add(space);
+ }
}
}
catch (FolderNotFoundException e)
@@ -282,7 +291,11 @@ public class SpacesServiceImpl implement
try
{
Space space =
loadSpace(pageManager.getFolder(makeSpacePath(spaceName)));
- return space;
+ // Exclude ordinary folders which is neither the root folder nor
the user home root folder.
+ if (space.getOwner() != null)
+ {
+ return space;
+ }
}
catch (FolderNotFoundException e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
