Author: taylor
Date: Tue May 19 22:02:31 2009
New Revision: 776486
URL: http://svn.apache.org/viewvc?rev=776486&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-998
fix a final bug
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/PrincipalDataProvider.java
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/PrincipalDataProvider.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/PrincipalDataProvider.java?rev=776486&r1=776485&r2=776486&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/PrincipalDataProvider.java
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/PrincipalDataProvider.java
Tue May 19 22:02:31 2009
@@ -107,10 +107,11 @@
{
if (roleManager.getPrincipal(filteredRole) == null)
{
- principalList = Collections.EMPTY_LIST;
+ principalList = new ArrayList<JetspeedPrincipal>();
}
else
{
+ principalList = new ArrayList<JetspeedPrincipal>();
List<JetspeedPrincipal> localList = (List<JetspeedPrincipal>)
manager.getPrincipals(searchString);
for (JetspeedPrincipal principal : localList)
{
@@ -122,12 +123,13 @@
if (role.getName().equals(filteredRole))
{
principalList.add(principal);
+ break;
}
}
}
catch (SecurityException e)
{
- principalList = Collections.EMPTY_LIST;
+ principalList = new ArrayList<JetspeedPrincipal>();
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
