Looks ok, but is this for JDK 9? If so, we shouldn't be fixing P4 bugs now since we are in Rampdown Phase 1.

--Sean

On 1/13/17 6:51 AM, Weijun Wang wrote:
Please review this code change:

diff --git
a/src/java.base/share/classes/sun/security/tools/keytool/Main.java
b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
--- a/src/java.base/share/classes/sun/security/tools/keytool/Main.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
@@ -474,7 +474,9 @@

             if (c != null) {
                 command = c;
-            } else if (collator.compare(flags, "-help") == 0) {
+            } else if (collator.compare(flags, "-help") == 0 ||
+                    collator.compare(flags, "-h") == 0 ||
+                    collator.compare(flags, "-?") == 0) {
                 help = true;
             } else if (collator.compare(flags, "-conf") == 0) {
                 i++;
diff --git
a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
@@ -444,6 +444,7 @@
             } else if (collator.compare(flags, "-strict") ==0) {
                 strict = true;
             } else if (collator.compare(flags, "-h") == 0 ||
+                        collator.compare(flags, "-?") == 0 ||
                         collator.compare(flags, "-help") == 0) {
                 fullusage();
             } else {

I don't intend to show it in the help screen. These tools have no other
options or commands that show an "alias". Some do have "legacy" names
(For example, "-genkeypair" was "-genkey") but they are not shown either.

Noreg-trivial.

Thanks
Max

Reply via email to