taylor 02/02/27 14:10:12
Modified: src/java/org/apache/jetspeed/services/profiler
JetspeedProfilerService.java
Log:
- role-based fallback wasn't working correctly with db-psml.
Revision Changes Path
1.23 +23 -22
jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java
Index: JetspeedProfilerService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- JetspeedProfilerService.java 11 Feb 2002 08:05:12 -0000 1.22
+++ JetspeedProfilerService.java 27 Feb 2002 22:10:12 -0000 1.23
@@ -133,7 +133,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Santiago Gala</a>
- * @version $Id: JetspeedProfilerService.java,v 1.22 2002/02/11 08:05:12 taylor Exp
$
+ * @version $Id: JetspeedProfilerService.java,v 1.23 2002/02/27 22:10:12 taylor Exp
$
*/
public class JetspeedProfilerService extends TurbineBaseService
@@ -593,29 +593,30 @@
if (null != doc)
return doc;
}
-
- if (null != locator.getGroup())
- {
- locator.setGroup(null);
- doc = PsmlManager.getDocument( locator );
- if (null != doc)
- return doc;
- }
- else if (null != locator.getRole())
+ if (!useRoleFallback)
{
- locator.setRole(null);
- doc = PsmlManager.getDocument( locator );
- if (null != doc)
- return doc;
- }
- else if (null != locator.getUser())
- {
- locator.setUser(null);
- doc = PsmlManager.getDocument( locator );
- if (null != doc)
- return doc;
+ if (null != locator.getGroup())
+ {
+ locator.setGroup(null);
+ doc = PsmlManager.getDocument( locator );
+ if (null != doc)
+ return doc;
+ }
+ else if (null != locator.getRole())
+ {
+ locator.setRole(null);
+ doc = PsmlManager.getDocument( locator );
+ if (null != doc)
+ return doc;
+ }
+ else if (null != locator.getUser())
+ {
+ locator.setUser(null);
+ doc = PsmlManager.getDocument( locator );
+ if (null != doc)
+ return doc;
+ }
}
-
return doc;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
