ICU-8675 Fixed a time zone parse regression problem. The condition used for checking...

X-SVN-Rev: 30266

diff --git a/icu4c/source/i18n/tzgnames.cpp b/icu4c/source/i18n/tzgnames.cpp
index 9ace791007ecc80e3ac512c7462f7ba4b08e4104..24aaf1ce1d5616fb5b04b7cd4d218c4aea77b564 100644 (file)
--- a/icu4c/source/i18n/tzgnames.cpp
+++ b/icu4c/source/i18n/tzgnames.cpp
@@ -972,7 +972,7 @@ TimeZoneGenericNames::findLocal(const UnicodeString& text, int32_t start, uint32
 
     int32_t maxLen = 0;
     UVector *results = handler.getMatches(maxLen);
-    if ((results != NULL && (maxLen == (text.length() - start))) || fGNamesTrieFullyLoaded) {
+    if (results != NULL && ((maxLen == (text.length() - start)) || fGNamesTrieFullyLoaded)) {
         // perfect match
         gmatchInfo = new TimeZoneGenericNameMatchInfo(results);
         if (gmatchInfo == NULL) {

diff --git a/icu4c/source/i18n/tznames_impl.cpp b/icu4c/source/i18n/tznames_impl.cpp
index d2682ea375732224fce8c65705d1fd9f25a0c123..e68833c5a6a639b1a6a47d8cee42829b60216748 100644 (file)
--- a/icu4c/source/i18n/tznames_impl.cpp
+++ b/icu4c/source/i18n/tznames_impl.cpp
@@ -1351,7 +1351,7 @@ TimeZoneNamesImpl::find(const UnicodeString& text, int32_t start, uint32_t types
 
     int32_t maxLen = 0;
     UVector *results = handler.getMatches(maxLen);
-    if ((results != NULL && (maxLen == (text.length() - start))) || fNamesTrieFullyLoaded) {
+    if (results != NULL && ((maxLen == (text.length() - start)) || fNamesTrieFullyLoaded)) {
         // perfect match
         matchInfo = new TimeZoneNameMatchInfoImpl(results);
         if (matchInfo == NULL) {