Update ICU to 54.1 step 1

source/i18n/timezone.cpp

 /*
 *******************************************************************************
-* Copyright (C) 1997-2013, International Business Machines Corporation and
+* Copyright (C) 1997-2014, International Business Machines Corporation and
 * others. All Rights Reserved.
 *******************************************************************************
 *
 * File TIMEZONE.CPP
 *
 * Modification History:
 *
 *   Date        Name        Description
 *   12/05/96    clhuang     Creation.
 *   04/21/97    aliu        General clean-up and bug fixing.
@@ skipping 1272 matching lines @@
 
 UnicodeString&
 TimeZone::getCustomID(const UnicodeString& id, UnicodeString& normalized, UErrorCode& status) {
     normalized.remove();
     if (U_FAILURE(status)) {
         return normalized;
     }
     int32_t sign, hour, min, sec;
     if (parseCustomID(id, sign, hour, min, sec)) {
         formatCustomID(hour, min, sec, (sign < 0), normalized);
+    } else {
+        status = U_ILLEGAL_ARGUMENT_ERROR;
     }
     return normalized;
 }
 
 UBool
 TimeZone::parseCustomID(const UnicodeString& id, int32_t& sign,
                         int32_t& hour, int32_t& min, int32_t& sec) {
     static const int32_t         kParseFailed = -99999;
 
     NumberFormat* numberFormat = 0;
@@ skipping 225 matching lines @@
         return winid;
     }
 
     // canonicalize the input ID
     UnicodeString canonicalID;
     UBool isSystemID = FALSE;
 
     getCanonicalID(id, canonicalID, isSystemID, status);
     if (U_FAILURE(status) || !isSystemID) {
         // mapping data is only applicable to tz database IDs
+        if (status == U_ILLEGAL_ARGUMENT_ERROR) {
+            // getWindowsID() sets an empty string where
+            // getCanonicalID() sets a U_ILLEGAL_ARGUMENT_ERROR.
+            status = U_ZERO_ERROR;
+        }
         return winid;
     }
 
     UResourceBundle *mapTimezones = ures_openDirect(NULL, "windowsZones", &status);
     ures_getByKey(mapTimezones, "mapTimezones", mapTimezones, &status);
 
     if (U_FAILURE(status)) {
         return winid;
     }
 
@@ skipping 109 matching lines @@
     return id;
 }
 #endif /* U_HIDE_DRAFT_API */
 
 
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 //eof