taylor 2004/06/01 09:36:33
Modified: portal/src/java/org/apache/jetspeed/engine
JetspeedEngine.java
Log:
allow pipeline to be specified in request attribute as well as request parameter
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.25 +5 -1
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java
Index: JetspeedEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- JetspeedEngine.java 29 May 2004 19:01:48 -0000 1.24
+++ JetspeedEngine.java 1 Jun 2004 16:36:33 -0000 1.25
@@ -258,6 +258,10 @@
}
String targetPipeline = context
.getRequestParameter(PortalReservedParameters.PIPELINE);
+ if (null == targetPipeline)
+ {
+ targetPipeline =
(String)context.getRequest().getAttribute(PortalReservedParameters.PIPELINE);
+ }
tlRequestContext.set(context);
Pipeline pipeline = defaultPipeline;
if (targetPipeline != null)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
