8174736: [JCP] [Mac]Cannot launch JCP on Mac os with language set to "Chinese,...

8174736: [JCP] [Mac]Cannot launch JCP on Mac os with language set to "Chinese, Simplified" while region is not China
Reviewed-by: bchristi

src/solaris/native/java/lang/java_props_macosx.c

@@ -46,6 +46,8 @@ char *getPosixLocale(int cat) {
 
 #define LOCALEIDLENGTH  128
 char *getMacOSXLocale(int cat) {
+    const char* retVal = NULL;
+
     switch (cat) {
     case LC_MESSAGES:
         {
@@ -72,6 +74,35 @@ char *getMacOSXLocale(int cat) {
             }
             CFRelease(languages);
 
+            retVal = languageString;
+
+            // Special case for Portuguese in Brazil:
+            // The language code needs the "_BR" region code (to distinguish it
+            // from Portuguese in Portugal), but this is missing when using the
+            // "Portuguese (Brazil)" language.
+            // If language is "pt" and the current locale is pt_BR, return pt_BR.
+            char localeString[LOCALEIDLENGTH];
+            if (strcmp(retVal, "pt") == 0 &&
+                    CFStringGetCString(CFLocaleGetIdentifier(CFLocaleCopyCurrent()),
+                                       localeString, LOCALEIDLENGTH, CFStringGetSystemEncoding()) &&
+                    strcmp(localeString, "pt_BR") == 0) {
+                retVal = localeString;
+            }
+        }
+        break;
+    default:
+        {
+            char localeString[LOCALEIDLENGTH];
+            if (!CFStringGetCString(CFLocaleGetIdentifier(CFLocaleCopyCurrent()),
+                                    localeString, LOCALEIDLENGTH, CFStringGetSystemEncoding())) {
+                return NULL;
+            }
+            retVal = localeString;
+        }
+        break;
+    }
+
+    if (retVal != NULL) {
         // Language IDs use the language designators and (optional) region
         // and script designators of BCP 47.  So possible formats are:
         //
@@ -86,7 +117,7 @@ char *getMacOSXLocale(int cat) {
         // In the case of region designators (alpha-2 and/or UN M.49), we convert
         // to our locale string format by changing '-' to '_'.  That is, if
         // the '-' is followed by fewer than 4 chars.
-            char* scriptOrRegion = strchr(languageString, '-');
+        char* scriptOrRegion = strchr(retVal, '-');
         if (scriptOrRegion != NULL) {
             int length = strlen(scriptOrRegion);
             if (length > 5) {
@@ -106,34 +137,9 @@ char *getMacOSXLocale(int cat) {
                       isdigit(scriptOrRegion[3])));
             }
         }
-            const char* retVal = languageString;
 
-            // Special case for Portuguese in Brazil:
-            // The language code needs the "_BR" region code (to distinguish it
-            // from Portuguese in Portugal), but this is missing when using the
-            // "Portuguese (Brazil)" language.
-            // If language is "pt" and the current locale is pt_BR, return pt_BR.
-            char localeString[LOCALEIDLENGTH];
-            if (strcmp(retVal, "pt") == 0 &&
-                    CFStringGetCString(CFLocaleGetIdentifier(CFLocaleCopyCurrent()),
-                                       localeString, LOCALEIDLENGTH, CFStringGetSystemEncoding()) &&
-                    strcmp(localeString, "pt_BR") == 0) {
-                retVal = localeString;
-            }
         return strdup(retVal);
     }
-        break;
-    default:
-        {
-            char localeString[LOCALEIDLENGTH];
-            if (CFStringGetCString(CFLocaleGetIdentifier(CFLocaleCopyCurrent()),
-                                   localeString, LOCALEIDLENGTH, CFStringGetSystemEncoding())) {
-                return strdup(localeString);
-            }
-        }
-        break;
-    }
-
     return NULL;
 }