### Eclipse Workspace Patch 1.0
#P JOSM
Index: src/org/openstreetmap/josm/data/osm/User.java
===================================================================
--- src/org/openstreetmap/josm/data/osm/User.java	(revision 8567)
+++ src/org/openstreetmap/josm/data/osm/User.java	(working copy)
@@ -58,6 +58,9 @@
         return user;
     }
 
+    private static long lastUid = 0;
+    private static Long lastUidObj = lastUid;
+
     /**
      * Creates a user known to the OSM server
      *
@@ -66,10 +69,22 @@
      * @return a new OSM user with the given name and uid
      */
     public static synchronized User createOsmUser(long uid, String name) {
-        User user = userMap.get(uid);
+
+        final Long uidObj;
+
+        if (lastUid == uid){
+            uidObj = lastUidObj;
+        }
+        else {
+            lastUid = uid;
+            lastUidObj = uid;
+            uidObj = lastUidObj;
+        }
+
+        User user = userMap.get(uidObj);
         if (user == null) {
             user = new User(uid, name);
-            userMap.put(user.getId(), user);
+            userMap.put(uidObj, user);
         }
         if (name != null) user.addName(name);
         return user;