commit 05fdd5a94d430a71b14491036e0adf32855a045c
author ksrini <none@none> Tue Jan 03 08:27:37 2012 -0800
committer ksrini <none@none> Tue Jan 03 08:27:37 2012 -0800
tree 20b9ff5175cb539612dca216fb1841d62f494e41
parent ca421a3c410b21140f0a624d715d1ea9d14422b7

7123582: (launcher) display the -version and -XshowSettings
Reviewed-by: alanb

src/share/bin/java.c

diff --git a/src/share/bin/java.c b/src/share/bin/java.c
index 619d64f..f084bd2 100644
--- a/src/share/bin/java.c
+++ b/src/share/bin/java.c
@@ -382,6 +382,11 @@
         exit(1);
     }
 
+    if (showSettings != NULL) {
+        ShowSettings(env, showSettings);
+        CHECK_EXCEPTION_LEAVE(1);
+    }
+
     if (printVersion || showVersion) {
         PrintJavaVersion(env, showVersion);
         CHECK_EXCEPTION_LEAVE(0);
@@ -390,10 +395,6 @@
         }
     }
 
-    if (showSettings != NULL) {
-        ShowSettings(env, showSettings);
-        CHECK_EXCEPTION_LEAVE(1);
-    }
     /* If the user specified neither a class name nor a JAR file */
     if (printXUsage || printUsage || what == 0 || mode == LM_UNKNOWN) {
         PrintUsage(env, printXUsage);