ggolden 02/05/20 05:58:13
Modified: src/java/org/apache/jetspeed/util/template
BaseJetspeedLink.java
Log:
when initializing in initLink(), first see if the Profile is in the rundata.
If not, create it (as this used to do always) and store it in the rundata,
but this would be a strange case...
Revision Changes Path
1.12 +13 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/BaseJetspeedLink.java
Index: BaseJetspeedLink.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/BaseJetspeedLink.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BaseJetspeedLink.java 8 May 2002 03:18:11 -0000 1.11
+++ BaseJetspeedLink.java 20 May 2002 12:58:13 -0000 1.12
@@ -86,7 +86,7 @@
* rendering code. This is done currently in VelocityPortlet.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Paul Spencer</a>
- * @version $Id: BaseJetspeedLink.java,v 1.11 2002/05/08 03:18:11 taylor Exp $
+ * @version $Id: BaseJetspeedLink.java,v 1.12 2002/05/20 12:58:13 ggolden Exp $
*/
public class BaseJetspeedLink implements ApplicationTool, JetspeedLink
{
@@ -896,7 +896,18 @@
try
{
- profile = Profiler.getProfile(rundata);
+ // get the profile that is set in the rundata
+ profile = rundata.getProfile();
+
+ // if there was no profile, try making one from the rundata
+ if (profile == null)
+ {
+ // this would only happen if the JetspeedAccessController didn't
get a chance
+ // to setup the rundata...
+ profile = Profiler.getProfile(rundata);
+ rundata.setProfile(profile);
+ Log.warn("BaseJetspeedLink: profile in rundata was null");
+ }
} catch (ProfileException e)
{
Log.error(e);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
