shuber 2004/10/18 16:56:26 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/java/org/jahia/params ParamBean.java
Log:
Added sanity check on guest user to test if it is coming from another site. If this
is the case we don't use it.
Revision Changes Path
1.149.2.7 +10 -0 jahia/src/java/org/jahia/params/ParamBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/params/ParamBean.java.diff?r1=1.149.2.6&r2=1.149.2.7&f=h
Index: ParamBean.java
===================================================================
RCS file: /home/cvs/repository/jahia/src/java/org/jahia/params/Attic/ParamBean.java,v
retrieving revision 1.149.2.6
retrieving revision 1.149.2.7
diff -u -r1.149.2.6 -r1.149.2.7
--- ParamBean.java 7 Oct 2004 17:27:20 -0000 1.149.2.6
+++ ParamBean.java 18 Oct 2004 14:56:26 -0000 1.149.2.7
@@ -3317,6 +3317,16 @@
}
*/
+ // sanity check for user guest, in case we're in the context of
+ // concurrent requests on multiple sites
+ if (theUser != null) {
+ if
(theUser.getUsername().equals(JahiaUserManagerService.GUEST_USERNAME) &&
+ theUser.getSiteID() != this.getSiteID()) {
+ // guest user coming from different site, let's ignore it.
+ theUser = null;
+ }
+ }
+
if (theUser == null) {
setUserGuest(this.getSiteID());
}
