ICU-461.12.tar.gz

[apple/icu.git] / icuSources / common / ucnv_io.c

diff --git a/icuSources/common/ucnv_io.c b/icuSources/common/ucnv_io.c
index 29876a6714fb522ff86c935a7d88b244dde33934..3b806d1c4a24a119bfc358bd629b090ed925fa6d 100644 (file)
--- a/icuSources/common/ucnv_io.c
+++ b/icuSources/common/ucnv_io.c
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *
-*   Copyright (C) 1999-2007, International Business Machines
+*   Copyright (C) 1999-2008, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
@@ -259,9 +259,6 @@ haveAliasData(UErrorCode *pErrorCode) {
 
         umtx_lock(NULL);
         if(gAliasData==NULL) {
-            gAliasData = data;
-            data=NULL;
-
             gMainTable.converterListSize      = sectionSizes[1];
             gMainTable.tagListSize            = sectionSizes[2];
             gMainTable.aliasListSize          = sectionSizes[3];
@@ -315,6 +312,9 @@ haveAliasData(UErrorCode *pErrorCode) {
                 ? gMainTable.stringTable : (table + currOffset));
 
             ucln_common_registerCleanup(UCLN_COMMON_UCNV_IO, ucnv_io_cleanup);
+
+            gAliasData = data;
+            data=NULL;
         }
         umtx_unlock(NULL);