# HG changeset patch
# User ohair
# Date 1279344404 25200
# Node ID 1771222afd14a4663f73ecb4cd389871b23e62e6
# Parent  d971cb7d840cbf1f1340f000536589af89877411
6969236: Regression: JVM identification fails due to Oracle rebranding in java.exe
Reviewed-by: asaha

diff -r d971cb7d840c -r 1771222afd14 make/hotspot_distro
--- a/make/hotspot_distro	Wed Jun 23 09:27:01 2010 -0700
+++ b/make/hotspot_distro	Fri Jul 16 22:26:44 2010 -0700
@@ -28,5 +28,5 @@
 
 # Don't put quotes (fail windows build).
 HOTSPOT_VM_DISTRO=Java HotSpot(TM)
-COMPANY_NAME=Oracle Corporation
+COMPANY_NAME=Sun Microsystems, Inc.
 PRODUCT_NAME=Java(TM) Platform SE
diff -r d971cb7d840c -r 1771222afd14 make/hotspot_version
--- a/make/hotspot_version	Wed Jun 23 09:27:01 2010 -0700
+++ b/make/hotspot_version	Fri Jul 16 22:26:44 2010 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=17
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=16
+HS_BUILD_NUMBER=17
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=6