3 files changed, 24 insertions, 18 deletions

diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 98ec287..52869b1 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Framework.Communications.Cache
         private readonly CommunicationsManager m_commsManager;
 
         public UserProfileData UserProfile { get { return m_userProfile; } }
-        protected internal UserProfileData m_userProfile;
+        private UserProfileData m_userProfile;
 
         /// <summary>
         /// Have we received the user's inventory from the inventory service?
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 36fe6e3..8f37f27 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -173,23 +173,26 @@ namespace OpenSim.Framework.Communications.Cache
         /// </summary>
         /// <param name="userProfile"></param>
         /// <returns>true if a user profile was found to update, false otherwise</returns>
-        public bool UpdateProfile(UserProfileData userProfile)
-        {            
-            lock (m_userProfilesById)
-            {            
-                CachedUserInfo userInfo = GetUserDetails(userProfile.ID);
-                
-                if (userInfo != null)
-                {
-                    userInfo.m_userProfile = userProfile;                   
-                    m_commsManager.UserService.UpdateUserProfile(userProfile);
-                    
-                    return true;
-                }
-            }
-            
-            return false;
-        }
+        // Commented out for now.  The implementation needs to be improved by protecting against race conditions,
+        // probably by making sure that the update doesn't use the UserCacheInfo.UserProfile directly (possibly via
+        // returning a read only class from the cache).
+//        public bool UpdateProfile(UserProfileData userProfile)
+//        {            
+//            lock (m_userProfilesById)
+//            {            
+//                CachedUserInfo userInfo = GetUserDetails(userProfile.ID);
+//                
+//                if (userInfo != null)
+//                {
+//                    userInfo.m_userProfile = userProfile;                   
+//                    m_commsManager.UserService.UpdateUserProfile(userProfile);
+//                    
+//                    return true;
+//                }
+//            }
+//            
+//            return false;
+//        }
         
         /// <summary>
         /// Populate caches with the given user profile
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index c7f3bfc..1711187 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -71,6 +71,8 @@ namespace OpenSim.Framework.Communications.Tests
             Assert.That(existingUserInfo, Is.Not.Null, "User info not found by name");                       
         }
         
+        /**
+         * Disabled as not fully implemented
         [Test]
         public void TestUpdateProfile()
         {
@@ -101,6 +103,7 @@ namespace OpenSim.Framework.Communications.Tests
             Assert.That(retrievedProfile.SurName, Is.EqualTo(newLastName));
             Assert.That(userDataPlugin.GetUserByUUID(userId).SurName, Is.EqualTo(newLastName));
         }
+        */
 
         [Test]
         public void TestFetchInventory()