src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Driver.java

rev 47855 : 8189102: All tools should support -?, -h and --help

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -503,13 +503,17 @@
                 }
 
                 throw new BadCommandLineException(
                     Messages.format(Messages.UNRECOGNIZED_MODE, args[i]));
             }
-            if (args[i].equals("-help")) {
+            if (args[i].equals("-?") ||
+                args[i].equals("-h") ||
+                args[i].equals("--help") ||
+                // -help: legacy. Undocumented.
+                args[i].equals("-help")) {
                 usage(this,false);
-                throw new WeAreDone();
+                System.exit(0);
             }
             if (args[i].equals("-private")) {
                 usage(this,true);
                 throw new WeAreDone();
             }