Author: taylor
Date: Fri Dec 30 16:21:28 2005
New Revision: 360204
URL: http://svn.apache.org/viewcvs?rev=360204&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-458
This patch fixes nothing for me, as the DB Page Manager is completely broken
here
from SVN head
but I think it fixes a bug I saw previously with customization
Modified:
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java
Modified:
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java?rev=360204&r1=360203&r2=360204&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java
(original)
+++
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java
Fri Dec 30 16:21:28 2005
@@ -260,6 +260,9 @@
*/
public List getPermissions()
{
+ if (permissionsList != null && !permissionsList.isEmpty()) {
+ this.permissions = this.getPermissionsAsString();
+ }
return permissionsList;
}
@@ -293,7 +296,7 @@
*/
public boolean principalsMatch(List userPrincipals, List rolePrincipals,
List groupPrincipals, boolean allowDefault)
{
- return ((allowDefault && (users == null) && (roles == null) && (groups
== null)) ||
+ return ((allowDefault && (getUsersAsString() == null) &&
(getRolesAsString() == null) && (getGroupsAsString() == null)) ||
((users != null) && (userPrincipals != null) &&
(users.equals(WILD_CHAR) || containsAny(usersList,
userPrincipals))) ||
((roles != null) && (rolePrincipals != null) &&
Modified:
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java?rev=360204&r1=360203&r2=360204&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java
(original)
+++
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java
Fri Dec 30 16:21:28 2005
@@ -375,6 +375,6 @@
*/
public boolean isEmpty()
{
- return ((owner == null) && (securityConstraints == null) &&
(securityConstraintsRefs == null));
+ return ((owner == null) && getSecurityConstraints().isEmpty() &&
getSecurityConstraintsRefs().isEmpty());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
