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 gg...@apache.org on 2002/05/14 19:35:32 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions JetspeedAccessController.java
ggolden 02/05/14 10:35:32
Modified: src/java/org/apache/jetspeed/services/rundata
DefaultJetspeedRunData.java
src/java/org/apache/jetspeed/modules/actions
JetspeedAccessController.java
Log:
This is a revert, really:
JetspeedAccessController to 1.2
DefaultJetspeedRunData to 1.9
Removed the change that removed the profile from the User getTemp()
Somethings in the customizers and navigations want it there!
Revision Changes Path
1.11 +10 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/services/rundata/DefaultJetspeedRunData.java
Index: DefaultJetspeedRunData.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/rundata/DefaultJetspeedRunData.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultJetspeedRunData.java 13 May 2002 13:03:57 -0000 1.10
+++ DefaultJetspeedRunData.java 14 May 2002 17:35:32 -0000 1.11
@@ -79,7 +79,7 @@
* @author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
* @author <a href="mailto:sgala@apache.org">Santiago Gala</a>
* @author <a href="mailto:paulsp@apache.org">Paul Spencer</a>
- * @version $Id: DefaultJetspeedRunData.java,v 1.10 2002/05/13 13:03:57 ggolden Exp $
+ * @version $Id: DefaultJetspeedRunData.java,v 1.11 2002/05/14 17:35:32 ggolden Exp $
*/
public class DefaultJetspeedRunData extends DefaultTurbineRunData
implements JetspeedRunData
@@ -271,7 +271,7 @@
*/
public void setProfile(Profile profile)
{
- this.profile = profile;
+ this.getUser().setTemp("profile",profile);
}
/**
@@ -281,7 +281,15 @@
*/
public Profile getProfile()
{
- return this.profile;
+ try
+ {
+ return (Profile)this.getUser().getTemp("profile");
+ } catch (Throwable t)
+ {
+ Log.error( "Captured Exception: " );
+ Log.error( t );
+ }
+ return null;
}
/** Clears the state of this object for recycling... */
1.4 +10 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JetspeedAccessController.java
Index: JetspeedAccessController.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JetspeedAccessController.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JetspeedAccessController.java 13 May 2002 13:03:56 -0000 1.3
+++ JetspeedAccessController.java 14 May 2002 17:35:32 -0000 1.4
@@ -72,7 +72,7 @@
in order to get the cached ACL list from logon
@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
-@version $Id: JetspeedAccessController.java,v 1.3 2002/05/13 13:03:56 ggolden Exp $
+@version $Id: JetspeedAccessController.java,v 1.4 2002/05/14 17:35:32 ggolden Exp $
*/
public class JetspeedAccessController extends AccessController
@@ -95,6 +95,15 @@
// get the profile and store it in the RunData
Profile newProfile = Profiler.getProfile(jdata);
- jdata.setProfile(newProfile);
+ Profile currentProfile = jdata.getProfile();
+
+ if ((currentProfile == null)
+ || (!currentProfile.equals(newProfile)))
+ {
+ // the profile changed due to the request parameters,
+ // change it in the RunData
+ jdata.setProfile(newProfile);
+ }
+
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>