ICU-2940 Remove synchronization from uset and uget DataDirectory().

X-SVN-Rev: 33472

diff --git a/icu4c/source/common/putil.cpp b/icu4c/source/common/putil.cpp
index 01b0683c31f6139458da30eb021048934e3888b1..a3d8df5a00a5641617e43c50431358515a67c0cb 100644 (file)
--- a/icu4c/source/common/putil.cpp
+++ b/icu4c/source/common/putil.cpp
@@ -1142,7 +1142,6 @@ static UBool U_CALLCONV putil_cleanup(void)
 /*
  * Set the data directory.
  *    Make a copy of the passed string, and set the global data dir to point to it.
- *    TODO:  see bug #2849, regarding thread safety.
  */
 U_CAPI void U_EXPORT2
 u_setDataDirectory(const char *directory) {
@@ -1175,13 +1174,11 @@ u_setDataDirectory(const char *directory) {
 #endif
     }
 
-    umtx_lock(NULL);
     if (gDataDirectory && *gDataDirectory) {
         uprv_free(gDataDirectory);
     }
     gDataDirectory = newDataDir;
     ucln_common_registerCleanup(UCLN_COMMON_PUTIL, putil_cleanup);
-    umtx_unlock(NULL);
 }
 
 U_CAPI UBool U_EXPORT2
@@ -1228,10 +1225,8 @@ u_getDataDirectory(void) {
 #endif
 
     /* if we have the directory, then return it immediately */
-    UMTX_CHECK(NULL, gDataDirectory, path);
-
-    if(path) {
-        return path;
+    if(gDataDirectory) {
+        return gDataDirectory;
     }
 
     /*