ggolden 02/05/13 06:03:57
Modified: src/java/org/apache/jetspeed/modules/actions
JetspeedAccessController.java
src/java/org/apache/jetspeed/services/rundata
DefaultJetspeedRunData.java
Log:
Removed storage of Profile from User getTemp, replaced in the JetspeedRunData.
The Profile is computed for each request and stored in the run data.
Storing a profile in the getTemp (i.e. the HTTP session) introduces a conflict
when more than one window is open in the session to more than one portal page.
Revision Changes Path
1.3 +2 -11
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JetspeedAccessController.java 23 Feb 2002 02:05:05 -0000 1.2
+++ JetspeedAccessController.java 13 May 2002 13:03:56 -0000 1.3
@@ -72,7 +72,7 @@
in order to get the cached ACL list from logon
@author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
-@version $Id: JetspeedAccessController.java,v 1.2 2002/02/23 02:05:05 taylor Exp $
+@version $Id: JetspeedAccessController.java,v 1.3 2002/05/13 13:03:56 ggolden Exp $
*/
public class JetspeedAccessController extends AccessController
@@ -95,15 +95,6 @@
// get the profile and store it in the RunData
Profile newProfile = Profiler.getProfile(jdata);
- 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);
- }
-
+ jdata.setProfile(newProfile);
}
}
1.10 +3 -11
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultJetspeedRunData.java 3 May 2002 15:05:56 -0000 1.9
+++ DefaultJetspeedRunData.java 13 May 2002 13:03:57 -0000 1.10
@@ -79,7 +79,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rapha�l Luta</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Santiago Gala</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Paul Spencer</a>
- * @version $Id: DefaultJetspeedRunData.java,v 1.9 2002/05/03 15:05:56 ggolden Exp $
+ * @version $Id: DefaultJetspeedRunData.java,v 1.10 2002/05/13 13:03:57 ggolden Exp
$
*/
public class DefaultJetspeedRunData extends DefaultTurbineRunData
implements JetspeedRunData
@@ -271,7 +271,7 @@
*/
public void setProfile(Profile profile)
{
- this.getUser().setTemp("profile",profile);
+ this.profile = profile;
}
/**
@@ -281,15 +281,7 @@
*/
public Profile getProfile()
{
- try
- {
- return (Profile)this.getUser().getTemp("profile");
- } catch (Throwable t)
- {
- Log.error( "Captured Exception: " );
- Log.error( t );
- }
- return null;
+ return this.profile;
}
/** Clears the state of this object for recycling... */
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
