From: Debabrata Sengupta <dsengup@svn.icu-project.org>
Date: Thu, 21 Jun 2012 20:58:24 +0000 (+0000)
Subject: ICU-8971 changes undone
X-Git-Tag: milestone-59-0-1~3748
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fab050ad449504bd7f6c811fde917541c6a6f3c8;p=icu

ICU-8971 changes undone

X-SVN-Rev: 31977
---

diff --git a/icu4c/source/common/uloc.cpp b/icu4c/source/common/uloc.cpp
index 557bbf4b22d..8cbf7a3f9c9 100644
--- a/icu4c/source/common/uloc.cpp
+++ b/icu4c/source/common/uloc.cpp
@@ -1701,7 +1701,7 @@ _canonicalize(const char* localeID,
             }
             if(_isIDSeparator(*tmpLocaleID)) {
                 /* If there is something else, then we add the _  if we found country before.*/
-                if (cntrySize >= 0 && ! _isIDSeparator(*(tmpLocaleID+1)) ) {
+                if (cntrySize > 0 ) {
                     ++fieldCount;
                     if(len<nameCapacity) {
                         name[len]='_';