Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/src/share/classes/com/sun/tools/javah/JavahTask.java	Tue Mar 23 18:05:54 2010 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javah/JavahTask.java	Wed Mar 24 12:18:17 2010 -0700
     1.3 @@ -318,12 +318,6 @@
     1.4      int run(String[] args) {
     1.5          try {
     1.6              handleOptions(args);
     1.7 -            if (classes == null || classes.size() == 0) {
     1.8 -                if (help || version || fullVersion)
     1.9 -                    return 0;
    1.10 -                else
    1.11 -                    return 1;
    1.12 -            }
    1.13              boolean ok = run();
    1.14              return ok ? 0 : 1;
    1.15          } catch (BadArgs e) {
    1.16 @@ -355,7 +349,7 @@
    1.17              fileManager = getDefaultFileManager(diagnosticListener, log);
    1.18  
    1.19          Iterator<String> iter = args.iterator();
    1.20 -        boolean noArgs = !iter.hasNext();
    1.21 +        noArgs = !iter.hasNext();
    1.22  
    1.23          while (iter.hasNext()) {
    1.24              String arg = iter.next();
    1.25 @@ -416,9 +410,9 @@
    1.26  
    1.27          Util util = new Util(log, diagnosticListener);
    1.28  
    1.29 -        if (help) {
    1.30 +        if (noArgs || help) {
    1.31              showHelp();
    1.32 -            return true;
    1.33 +            return help; // treat noArgs as an error for purposes of exit code
    1.34          }
    1.35  
    1.36          if (version || fullVersion) {
    1.37 @@ -636,6 +630,7 @@
    1.38      String usercp;
    1.39      List<String> classes;
    1.40      boolean verbose;
    1.41 +    boolean noArgs;
    1.42      boolean help;
    1.43      boolean trace;
    1.44      boolean version;