You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by re...@apache.org on 2010/08/23 04:51:55 UTC

svn commit: r987981 - /harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/shared/luniglob.c

Author: regisxu
Date: Mon Aug 23 02:51:55 2010
New Revision: 987981

URL: http://svn.apache.org/viewvc?rev=987981&view=rev
Log:
The default 'file.encoding' on z/OS should be EBCDIC

Modified:
    harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/shared/luniglob.c

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/shared/luniglob.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/shared/luniglob.c?rev=987981&r1=987980&r2=987981&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/shared/luniglob.c (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/shared/luniglob.c Mon Aug 23 02:51:55 2010
@@ -156,9 +156,13 @@ JNI_OnLoad (JavaVM * vm, void *reserved)
        /* Many classes depend on correct "file.encoding" value */
        (*vmInterface)->GetSystemProperty (vmInterface, "file.encoding", &propVal);
        if (propVal == NULL) {
+#if defined(ZOS)
+           propRes = (*vmInterface)->SetSystemProperty (vmInterface, "file.encoding", "IBM-1047");
+#else
            /* FIXME provide appropriate non-dummy value */
            getOSCharset(charset, CHARSETBUFF);
            propRes = (*vmInterface)->SetSystemProperty (vmInterface, "file.encoding", charset);
+#endif
            if (VMI_ERROR_NONE != propRes) {
                /* goto fail2; */
            }