ICU 56 update step 1

source/i18n/timezone.cpp

 /*
 *******************************************************************************
 * Copyright (C) 1997-2015, International Business Machines Corporation and
 * others. All Rights Reserved.
 *******************************************************************************
 *
 * File TIMEZONE.CPP
 *
 * Modification History:
 *
@@ skipping 409 matching lines @@
     /* We first try to lookup the zone ID in our system list.  If this
      * fails, we try to parse it as a custom string GMT[+-]hh:mm.  If
      * all else fails, we return GMT, which is probably not what the
      * user wants, but at least is a functioning TimeZone object.
      *
      * We cannot return NULL, because that would break compatibility
      * with the JDK.
      */
     TimeZone* result = createSystemTimeZone(ID);
 
-    if (result == 0) {
+    if (result == NULL) {
         U_DEBUG_TZ_MSG(("failed to load system time zone with id - falling to custom"));
         result = createCustomTimeZone(ID);
     }
-    if (result == 0) {
+    if (result == NULL) {
         U_DEBUG_TZ_MSG(("failed to load time zone with id - falling to Etc/Unknown(GMT)"));
-        result = getUnknown().clone();
+        const TimeZone& unknown = getUnknown();
+        if (_UNKNOWN_ZONE == NULL) {                   // Cannot test (&unknown == NULL) because the
+          U_DEBUG_TZ_MSG(("failed to getUnknown()"));  // behavior of NULL references is undefined.
+        } else {
+          result = unknown.clone();
+        }
     }
     return result;
 }
 
 // -------------------------------------
 
 TimeZone* U_EXPORT2
 TimeZone::detectHostTimeZone()
 {
     // We access system timezone data through TPlatformUtilities,
     // including tzset(), timezone, and tzname[].
     int32_t rawOffset = 0;
     const char *hostID;
 
     // First, try to create a system timezone, based
     // on the string ID in tzname[0].
 
     uprv_tzset(); // Initialize tz... system data
 
-    uprv_tzname_clear_cache();
-
     // Get the timezone ID from the host.  This function should do
     // any required host-specific remapping; e.g., on Windows this
     // function maps the Date and Time control panel setting to an
     // ICU timezone ID.
     hostID = uprv_tzname(0);
 
     // Invert sign because UNIX semantics are backwards
     rawOffset = uprv_timezone() * -U_MILLIS_PER_SECOND;
 
     TimeZone* hostZone = NULL;
@@ skipping 1069 matching lines @@
             isSystemID = TRUE;
         } else {
             // Not a system ID
             status = U_ZERO_ERROR;
             getCustomID(id, canonicalID, status);
         }
     }
     return canonicalID;
 }
 
-#ifndef U_HIDE_DRAFT_API
 UnicodeString&
 TimeZone::getWindowsID(const UnicodeString& id, UnicodeString& winid, UErrorCode& status) {
     winid.remove();
     if (U_FAILURE(status)) {
         return winid;
     }
 
     // canonicalize the input ID
     UnicodeString canonicalID;
     UBool isSystemID = FALSE;
@@ skipping 120 matching lines @@
         tzid = ures_getStringByKey(zones, "001", &len, &status);    // using status, because "001" must be
                                                                 // available at this point
         if (U_SUCCESS(status)) {
             id.setTo(tzid, len);
         }
     }
 
     ures_close(zones);
     return id;
 }
-#endif /* U_HIDE_DRAFT_API */
 
 
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 //eof