Changeset 407 for trunk/openjdk

Timestamp:

Dec 31, 2012, 2:08:15 PM (13 years ago)

Author:

dmik

Message:

jdk: Use stdout instead of stderr for printing usage info from the JAVA launcher.

Printing usage info to stderr is not respected on OS/2. See also #64 for more details.

File:

• trunk/openjdk/jdk/src/share/bin/java.c (modified) (2 diffs)

trunk/openjdk/jdk/src/share/bin/java.c

@@ -1705 +1705 @@
     NULL_CHECK(printXUsageMessage = (*env)->GetStaticMethodID(env, cls,
                                         "printXUsageMessage", "(Z)V"));
+#ifdef __OS2__
+    // printing usage info to stderr is not respected, use stdout
+    (*env)->CallStaticVoidMethod(env, cls, printXUsageMessage, JNI_FALSE);
+#else
     (*env)->CallStaticVoidMethod(env, cls, printXUsageMessage, JNI_TRUE);
+#endif
   } else {
     NULL_CHECK(initHelp = (*env)->GetStaticMethodID(env, cls,
@@ -1764 +1769 @@
 
     /* Complete the usage message and print to stderr*/
+#ifdef __OS2__
+    // printing usage info to stderr is not respected, use stdout
+    (*env)->CallStaticVoidMethod(env, cls, printHelp, JNI_FALSE);
+#else
     (*env)->CallStaticVoidMethod(env, cls, printHelp, JNI_TRUE);
+#endif
   }
   return;