Scarab commit: svn commit: r10217 - branches/release/b21/src/java/org/tigris/scarab/screens/ScarabDefault.java

Author: dabbous
Date: 2006-07-22 02:55:57-0700
New Revision: 10217

Modified:
   branches/release/b21/src/java/org/tigris/scarab/screens/ScarabDefault.java

Log:
sometimes the scarab session was lost.
this was due to a unneaded intermediate anonymous login
in ScarabDefault.java

Modified: branches/release/b21/src/java/org/tigris/scarab/screens/ScarabDefault.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/screens/ScarabDefault.java?view=diff&rev=10217&p1=branches/release/b21/src/java/org/tigris/scarab/screens/ScarabDefault.java&p2=branches/release/b21/src/java/org/tigris/scarab/screens/ScarabDefault.java&r1=10216&r2=10217
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/screens/ScarabDefault.java	(original)
+++ branches/release/b21/src/java/org/tigris/scarab/screens/ScarabDefault.java	2006-07-22 02:55:57-0700
@@ -48,8 +48,10 @@
 
 
 // Turbine Stuff 
+import org.apache.fulcrum.security.entity.User;
 import org.apache.turbine.RunData;
 import org.apache.turbine.TemplateContext;
+import org.tigris.scarab.om.ScarabUser;
 import org.tigris.scarab.util.AnonymousUserUtil;
 
 /**
@@ -68,7 +70,12 @@
         throws Exception 
     {
         super.doBuildTemplate(data, context);
-        AnonymousUserUtil.anonymousLogin(data);
+        //ScarabUser user = (ScarabUser)data.getUser();
+        // only login as anonymous if currently no user is logged in
+        //if(user == null || user.getUserId() == null || user.getUserId().longValue()==0)
+        //{
+        //    AnonymousUserUtil.anonymousLogin(data);
+        //}
         context.put("modulelink", new ModuleSwitchingLink(data));
     }
 }