diff options
| author | Alexey Ushakov <Alexey.Ushakov@jetbrains.com> | 2016-07-12 15:34:11 +0300 |
|---|---|---|
| committer | Alexey Ushakov <Alexey.Ushakov@jetbrains.com> | 2016-07-12 15:34:11 +0300 |
| commit | d9fadb1201cbab555f581dedf47983176c09a733 (patch) | |
| tree | 0eb4f12b92e4661a1dc051122e722016877ace13 | |
| parent | 5ad1a13892633b89dfc682b9e521fcd8dcc7eb2f (diff) | |
| parent | 86e0a8276306945a1ed6aee23076c1734483f6d6 (diff) | |
| download | jdk8u_hotspot-d9fadb1201cbab555f581dedf47983176c09a733.tar.gz | |
Merge branch 'master' of github.com:JetBrains/jdk8u_hotspotjb8u76-b250jb8u112-b696.696.1jb8u112-b343jb8u112-b300jb8u112-b299jb8u112-b298jb8u112-b295jb8u112-b291jb8u112-b287.3jb8u112-b287.2jb8u112-b287.1jb8u112-b287jb8u112-b286jb8u112-b285jb8u112-b284jb8u112-b283jb8u112-b274jb8u112-b271jb8u112-b270jb8u112-b267jb8u112-b258jb8u112-b257jb8u112-b256jb8u112-b255jb8u112-b254jb8u112-b251
| -rw-r--r-- | src/share/vm/runtime/vm_version.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/share/vm/runtime/vm_version.cpp b/src/share/vm/runtime/vm_version.cpp index a046d8142..10cbc0804 100644 --- a/src/share/vm/runtime/vm_version.cpp +++ b/src/share/vm/runtime/vm_version.cpp @@ -141,8 +141,7 @@ const char* Abstract_VM_Version::vm_vendor() { #ifdef VENDOR return XSTR(VENDOR); #else - return JDK_Version::is_gte_jdk17x_version() ? - "Oracle Corporation" : "Sun Microsystems Inc."; + return "JetBrains s.r.o"; #endif } |