Update of 
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
In directory james.mmbase.org:/tmp/cvs-serv23589

Modified Files:
      Tag: MMBase-1_8
        Users.java 
Log Message:
should fix   MMB-1669


See also: 
http://cvs.mmbase.org/viewcvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
See also: http://www.mmbase.org/jira/browse/MMB-1669


Index: Users.java
===================================================================
RCS file: 
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders/Users.java,v
retrieving revision 1.48.2.2
retrieving revision 1.48.2.3
diff -u -b -r1.48.2.2 -r1.48.2.3
--- Users.java  28 Jun 2008 11:57:59 -0000      1.48.2.2
+++ Users.java  30 Jun 2008 08:13:11 -0000      1.48.2.3
@@ -31,7 +31,7 @@
  * @author Eduard Witteveen
  * @author Pierre van Rooden
  * @author Michiel Meeuwissen
- * @version $Id: Users.java,v 1.48.2.2 2008/06/28 11:57:59 nklasens Exp $
+ * @version $Id: Users.java,v 1.48.2.3 2008/06/30 08:13:11 michiel Exp $
  * @since  MMBase-1.7
  */
 public class Users extends MMObjectBuilder {
@@ -530,6 +530,7 @@
     protected void invalidateCaches(int nodeNumber) {
         rankCache.remove(new Integer(nodeNumber));
 
+        synchronized(userCache.getLock()) {
         Iterator i =  userCache.entrySet().iterator();
         while (i.hasNext()) {
             Map.Entry entry = (Map.Entry) i.next();
@@ -544,6 +545,7 @@
             }
         }
     }
+    }
 
 
     public boolean nodeChanged(String machine, String number, String builder, 
String ctype) {
@@ -558,6 +560,7 @@
 
             MMObjectNode node = getNode(number);
             Map users = new HashMap();
+            synchronized(userCache.getLock()) {
             Iterator i = userCache.entrySet().iterator();
             while (i.hasNext()) {
                 Map.Entry entry = (Map.Entry) i.next();
@@ -572,6 +575,7 @@
                     }
                 }
             }
+            }
             userCache.putAll(users);
         }
         return true;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to