go back to ps #4

source/common/umutex.cpp

 /*
 ******************************************************************************
 *
 *   Copyright (C) 1997-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
 *
 * File umutex.cpp
 *
@@ skipping 331 matching lines @@
 umtx_atomic_dec(u_atomic_int32_t *p) {
     int32_t retVal;
     umtx_lock(&gIncDecMutex);
     retVal = --(*p);
     umtx_unlock(&gIncDecMutex);
     return retVal;
 }
 
 U_COMMON_API int32_t U_EXPORT2
 umtx_loadAcquire(u_atomic_int32_t &var) {
+    umtx_lock(&gIncDecMutex);
     int32_t val = var;
-    umtx_lock(&gIncDecMutex);
     umtx_unlock(&gIncDecMutex);
     return val;
 }
 
 U_COMMON_API void U_EXPORT2
 umtx_storeRelease(u_atomic_int32_t &var, int32_t val) {
     umtx_lock(&gIncDecMutex);
+    var = val;
     umtx_unlock(&gIncDecMutex);
-    var = val;
 }
 
 U_NAMESPACE_END
 #endif
 
 //--------------------------------------------------------------------------
 //
 //  Deprecated functions for setting user mutexes.
 //
 //--------------------------------------------------------------------------
@@ skipping 10 matching lines @@
 
 
 U_DEPRECATED void U_EXPORT2
 u_setAtomicIncDecFunctions(const void * /*context */, UMtxAtomicFn *, UMtxAtomicFn *,
                            UErrorCode *status) {
     if (U_SUCCESS(*status)) {
         *status = U_UNSUPPORTED_ERROR;
     }
     return;
 }