equal
deleted
inserted
replaced
1003 } |
1003 } |
1004 |
1004 |
1005 char java_runtime_name[128] = ""; |
1005 char java_runtime_name[128] = ""; |
1006 char java_runtime_version[128] = ""; |
1006 char java_runtime_version[128] = ""; |
1007 |
1007 |
1008 // extract the JRE name from sun.misc.Version.java_runtime_name |
1008 // extract the JRE name from java.lang.VersionProps.java_runtime_name |
1009 static const char* get_java_runtime_name(TRAPS) { |
1009 static const char* get_java_runtime_name(TRAPS) { |
1010 Klass* k = SystemDictionary::find(vmSymbols::sun_misc_Version(), |
1010 Klass* k = SystemDictionary::find(vmSymbols::java_lang_VersionProps(), |
1011 Handle(), Handle(), CHECK_AND_CLEAR_NULL); |
1011 Handle(), Handle(), CHECK_AND_CLEAR_NULL); |
1012 fieldDescriptor fd; |
1012 fieldDescriptor fd; |
1013 bool found = k != NULL && |
1013 bool found = k != NULL && |
1014 InstanceKlass::cast(k)->find_local_field(vmSymbols::java_runtime_name_name(), |
1014 InstanceKlass::cast(k)->find_local_field(vmSymbols::java_runtime_name_name(), |
1015 vmSymbols::string_signature(), &fd); |
1015 vmSymbols::string_signature(), &fd); |
1025 } else { |
1025 } else { |
1026 return NULL; |
1026 return NULL; |
1027 } |
1027 } |
1028 } |
1028 } |
1029 |
1029 |
1030 // extract the JRE version from sun.misc.Version.java_runtime_version |
1030 // extract the JRE version from java.lang.VersionProps.java_runtime_version |
1031 static const char* get_java_runtime_version(TRAPS) { |
1031 static const char* get_java_runtime_version(TRAPS) { |
1032 Klass* k = SystemDictionary::find(vmSymbols::sun_misc_Version(), |
1032 Klass* k = SystemDictionary::find(vmSymbols::java_lang_VersionProps(), |
1033 Handle(), Handle(), CHECK_AND_CLEAR_NULL); |
1033 Handle(), Handle(), CHECK_AND_CLEAR_NULL); |
1034 fieldDescriptor fd; |
1034 fieldDescriptor fd; |
1035 bool found = k != NULL && |
1035 bool found = k != NULL && |
1036 InstanceKlass::cast(k)->find_local_field(vmSymbols::java_runtime_version_name(), |
1036 InstanceKlass::cast(k)->find_local_field(vmSymbols::java_runtime_version_name(), |
1037 vmSymbols::string_signature(), &fd); |
1037 vmSymbols::string_signature(), &fd); |