From 92b493890ee295ca42da33f38a12c63cdf5f6f22 Mon Sep 17 00:00:00 2001
From: sgehwolf <unknown>
Date: Wed, 12 Dec 2018 14:46:23 +0100
Subject: [PATCH] 8059038: Create new launcher for SA tools Summary: Create
 separate launchers for clhsdb and hsdb since JDK 8 uses separate launchers
 for SA tools Reviewed-by: kevinw, andrew

---
 agent/src/share/classes/sun/jvm/hotspot/CLHSDB.java | 3 ++-
 agent/src/share/classes/sun/jvm/hotspot/HSDB.java   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/agent/src/share/classes/sun/jvm/hotspot/CLHSDB.java b/agent/src/share/classes/sun/jvm/hotspot/CLHSDB.java
index a5393107a..b1f8d838f 100644
--- a/agent/src/share/classes/sun/jvm/hotspot/CLHSDB.java
+++ b/agent/src/share/classes/sun/jvm/hotspot/CLHSDB.java
@@ -113,7 +113,8 @@ public class CLHSDB {
     private String coreFilename;
 
     private void doUsage() {
-        System.out.println("Usage:  java CLHSDB [[pid] | [path-to-java-executable [path-to-corefile]] | help ]");
+        // With JDK-8059038 launchers for this class exist. Print usage for those launchers.
+        System.out.println("Usage:  clhsdb [[pid] | [path-to-java-executable [path-to-corefile]] | help | -help ]");
         System.out.println("           pid:                     attach to the process whose id is 'pid'");
         System.out.println("           path-to-java-executable: Debug a core file produced by this program");
         System.out.println("           path-to-corefile:        Debug this corefile.  The default is 'core'");
diff --git a/agent/src/share/classes/sun/jvm/hotspot/HSDB.java b/agent/src/share/classes/sun/jvm/hotspot/HSDB.java
index 9ae362baa..97726c4e6 100644
--- a/agent/src/share/classes/sun/jvm/hotspot/HSDB.java
+++ b/agent/src/share/classes/sun/jvm/hotspot/HSDB.java
@@ -82,7 +82,8 @@ public class HSDB implements ObjectHistogramPanel.Listener, SAListener {
   private String coreFilename;
 
   private void doUsage() {
-    System.out.println("Usage:  java HSDB [[pid] | [path-to-java-executable [path-to-corefile]] | help ]");
+    // With JDK-8059038 launchers for this class exist. Print usage for those launchers.
+    System.out.println("Usage:  hsdb [[pid] | [path-to-java-executable [path-to-corefile]] | help | -help ]");
     System.out.println("           pid:                     attach to the process whose id is 'pid'");
     System.out.println("           path-to-java-executable: Debug a core file produced by this program");
     System.out.println("           path-to-corefile:        Debug this corefile.  The default is 'core'");
-- 
GitLab