Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@harmony.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r996761 - in /harmony/enhanced/java/branches/java6: ./
 classlib/
 classlib/depends/libs/
 classlib/modules/luni/src/main/native/luni/shared/luniglob.c drlvm/ jdktools/
Date: Tue, 14 Sep 2010 05:55:35 -0000
To: commits@harmony.apache.org
From: hindessm@apache.org
Message-Id: <20100914055535.6731B23889E0@eris.apache.org>

Author: hindessm
Date: Tue Sep 14 05:55:34 2010
New Revision: 996761

URL: http://svn.apache.org/viewvc?rev=996761&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@996567:

  r996567 | odeakin | 2010-09-13 16:05:38 +0100 (Mon, 13 Sep 2010) | 1 line
  
  On z/OS, ensure that stdout is only line buffered and has a maximum buffer of 128.


Modified:
    harmony/enhanced/java/branches/java6/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/shared/luniglob.c
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 14 05:55:34 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-996210,996457
+/harmony/enhanced/java/trunk:929253-996210,996457,996567
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 14 05:55:34 2010
@@ -1,7 +1,7 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-996210,996457
+/harmony/enhanced/java/trunk/classlib:929253-996210,996457,996567
 /harmony/enhanced/trunk/classlib:476395-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/classlib:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 14 05:55:34 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-996210,996457
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-996210,996457,996567
 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252
 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/shared/luniglob.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/shared/luniglob.c?rev=996761&r1=996760&r2=996761&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/shared/luniglob.c (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/shared/luniglob.c Tue Sep 14 05:55:34 2010
@@ -57,6 +57,11 @@ JNI_OnLoad (JavaVM * vm, void *reserved)
   char charset[CHARSETBUFF];
   vmiError propRes;
 
+#ifdef ZOS
+  /* Ensure that stdout only line buffers and has a maximum buffer of 128 */
+  setvbuf(stdout, NULL, _IOLBF, 128);
+#endif
+
   /* Query the VM interface */
   vmInterface = VMI_GetVMIFromJavaVM (vm);
   if (!vmInterface)

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 14 05:55:34 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-996210,996457
+/harmony/enhanced/java/trunk/drlvm:929253-996210,996457,996567
 /harmony/enhanced/trunk/drlvm:476395-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/drlvm:292550-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 14 05:55:34 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-996210,996457
+/harmony/enhanced/java/trunk/jdktools:929253-996210,996457,996567
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147