comparison src/java.base/share/classes/sun/misc/Version.java.template @ 13209:c95bba55626c

8139986: Store debug level in java.vm.debug and conditionally print in "java -version" Reviewed-by: ihse, dcubed, ksrini, dholmes Contributed-by: alejandro.murillo@oracle.com, kumar.x.srinivasan@oracle.com
author amurillo
date Wed, 04 Nov 2015 16:02:53 -0800
parents 9cea16b048db
children
comparison
equal deleted inserted replaced
4:214134c55ac1 5:dae0852fa6f7
96 /* First line: platform version. */ 96 /* First line: platform version. */
97 ps.println(launcher_name + " version \"" + java_version + "\""); 97 ps.println(launcher_name + " version \"" + java_version + "\"");
98 98
99 /* Second line: runtime version (ie, libraries). */ 99 /* Second line: runtime version (ie, libraries). */
100 100
101 ps.print(java_runtime_name + " (build " + java_runtime_version); 101 String jdk_debug_level = System.getProperty("jdk.debug", "release");
102 /* Debug level is not printed for "release" builds */
103 if ("release".equals(jdk_debug_level)) {
104 jdk_debug_level = "";
105 } else {
106 jdk_debug_level = jdk_debug_level + " ";
107 }
108
109 ps.print(java_runtime_name + " (" + jdk_debug_level + "build " + java_runtime_version);
102 110
103 if (java_runtime_name.indexOf("Embedded") != -1 && isHeadless) { 111 if (java_runtime_name.indexOf("Embedded") != -1 && isHeadless) {
104 // embedded builds report headless state 112 // embedded builds report headless state
105 ps.print(", headless"); 113 ps.print(", headless");
106 } 114 }
108 116
109 /* Third line: JVM information. */ 117 /* Third line: JVM information. */
110 String java_vm_name = System.getProperty("java.vm.name"); 118 String java_vm_name = System.getProperty("java.vm.name");
111 String java_vm_version = System.getProperty("java.vm.version"); 119 String java_vm_version = System.getProperty("java.vm.version");
112 String java_vm_info = System.getProperty("java.vm.info"); 120 String java_vm_info = System.getProperty("java.vm.info");
113 ps.println(java_vm_name + " (build " + java_vm_version + ", " + 121 ps.println(java_vm_name + " (" + jdk_debug_level + "build " + java_vm_version + ", " +
114 java_vm_info + ")"); 122 java_vm_info + ")");
115 } 123 }
116 124
117 125
118 /** 126 /**