You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2004/09/27 21:52:31 UTC
cvs commit: jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl RoleFallbackProfilingRule.java
taylor 2004/09/27 12:52:31
Modified: components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl
RoleFallbackProfilingRule.java
Log:
check for NULL so we don't before tokenizing
Revision Changes Path
1.5 +5 -5 jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RoleFallbackProfilingRule.java
Index: RoleFallbackProfilingRule.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RoleFallbackProfilingRule.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RoleFallbackProfilingRule.java 23 Sep 2004 22:34:20 -0000 1.4
+++ RoleFallbackProfilingRule.java 27 Sep 2004 19:52:31 -0000 1.5
@@ -62,8 +62,8 @@
resolver = getDefaultResolver();
}
String value = resolver.resolve(context, criterion);
- if (resolver instanceof RoleCriterionResolver ||
- resolver instanceof GroupCriterionResolver)
+ if (value != null && (resolver instanceof RoleCriterionResolver ||
+ resolver instanceof GroupCriterionResolver))
{
StringTokenizer tokenizer = new StringTokenizer(value, StandardResolver.VALUE_DELIMITER);
while (tokenizer.hasMoreTokens())
@@ -115,8 +115,8 @@
{
String value = resolver.resolve(context, criterion);
boolean isControl = resolver.isControl(criterion);
- if (resolver instanceof RoleCriterionResolver ||
- resolver instanceof GroupCriterionResolver)
+ if (value != null && (resolver instanceof RoleCriterionResolver ||
+ resolver instanceof GroupCriterionResolver))
{
StringTokenizer tokenizer = new StringTokenizer(value, StandardResolver.VALUE_DELIMITER);
while (tokenizer.hasMoreTokens())
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org