[MMBASE SCM] r42077 - didactor/trunk/components/core/src/main/java/nl/didactor/filter

[michiel]

Author: michiel
Date: 2010-04-29 15:42:35 +0200 (Thu, 29 Apr 2010)
New Revision: 42077

Modified:
   
didactor/trunk/components/core/src/main/java/nl/didactor/filter/ProviderFilter.java
Log:
removed eduaction caching in session, it's more trouble than worth it

Modified: 
didactor/trunk/components/core/src/main/java/nl/didactor/filter/ProviderFilter.java
===================================================================
--- 
didactor/trunk/components/core/src/main/java/nl/didactor/filter/ProviderFilter.java
 2010-04-29 13:42:12 UTC (rev 42076)
+++ 
didactor/trunk/components/core/src/main/java/nl/didactor/filter/ProviderFilter.java
 2010-04-29 13:42:35 UTC (rev 42077)
@@ -42,7 +42,6 @@
 
 
     public static String USER_KEY = "nl.didactor.user_attributes";
-    public static String EDUCATION_KEY = "nl.didactor.education";
 
     private static Map<String, Map<String, Object>> providerCache = new 
HashMap<String, Map<String, Object>>();
 
@@ -123,7 +122,6 @@
 
     protected static NodeList selectForUser(Cloud cloud, NodeList nodes) {
         int userNode = 
cloud.getCloudContext().getAuthentication().getNode(cloud.getUser());
-        log.debug("Fitering for user " + cloud.getUser());
         if (cloud.hasNode(userNode)) {
             Node user = cloud.getNode(userNode);
             Set<Node> related = (Set<Node>) 
user.getFunctionValue("educations", null).get();
@@ -135,8 +133,13 @@
                     result.add(e);
                 }
             }
+            if (log.isDebugEnabled()) {
+                log.debug("Fitered for user " + userNode + " " + related + " 
-> " + result);
+            }
+
             return result;
         } else {
+            log.debug("No such user " + userNode);
             return nodes;
         }
     }
@@ -311,11 +314,8 @@
         if (parameterEducation != null && parameterEducation.length() == 0) {
             parameterEducation = null;
         }
-        if (parameterEducation == null && session != null) {
-            parameterEducation = (String) session.getAttribute(EDUCATION_KEY);
-            log.debug("education found from session " + parameterEducation);
-        }
 
+
         String parameterProvider  = req.getParameter("provider");
 
         log.debug("Provider found from request " + parameterProvider);
@@ -324,12 +324,6 @@
 
         final Map<String, Serializable> userAttributes = 
getUserAttributes(cloud, req);
         final int userNumber = (Integer) userAttributes.get("user");
-        if (session != null) {
-            if (parameterEducation != null && userNumber > 0) {
-                // remember some explicit education parameter in the session.
-                session.setAttribute(EDUCATION_KEY, parameterEducation);
-            }
-        }
 
         String key = serverName + contextPath + ':' + parameterEducation + ':' 
+ parameterProvider  + ":" + cloud.getUser().getIdentifier();
 

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs