Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8033686: Internal error for zero indent
authorjjg
Thu, 06 Feb 2014 10:58:51 -0800
changeset 23106 852816600f04
parent 23105 1d1ea26a10ae
child 23107 d4df5e8d24d2
8033686: Internal error for zero indent Reviewed-by: ksrini
langtools/src/share/classes/com/sun/tools/javap/JavapTask.java file | annotate | diff | comparison | revisions
langtools/src/share/classes/com/sun/tools/javap/Options.java file | annotate | diff | comparison | revisions 
--- a/langtools/src/share/classes/com/sun/tools/javap/JavapTask.java	Thu Feb 06 18:49:01 2014 +0000
+++ b/langtools/src/share/classes/com/sun/tools/javap/JavapTask.java	Thu Feb 06 10:58:51 2014 -0800
@@ -273,7 +273,9 @@
             void process(JavapTask task, String opt, String arg) throws BadArgs {
                 int sep = opt.indexOf(":");
                 try {
-                    task.options.indentWidth = Integer.valueOf(opt.substring(sep + 1));
+                    int i = Integer.valueOf(opt.substring(sep + 1));
+                    if (i > 0) // silently ignore invalid values
+                        task.options.indentWidth = i;
                 } catch (NumberFormatException e) {
                 }
             }
@@ -289,7 +291,9 @@
             void process(JavapTask task, String opt, String arg) throws BadArgs {
                 int sep = opt.indexOf(":");
                 try {
-                    task.options.tabColumn = Integer.valueOf(opt.substring(sep + 1));
+                    int i = Integer.valueOf(opt.substring(sep + 1));
+                    if (i > 0) // silently ignore invalid values
+                        task.options.tabColumn = i;
                 } catch (NumberFormatException e) {
                 }
             }
--- a/langtools/src/share/classes/com/sun/tools/javap/Options.java	Thu Feb 06 18:49:01 2014 +0000
+++ b/langtools/src/share/classes/com/sun/tools/javap/Options.java	Thu Feb 06 10:58:51 2014 -0800
@@ -86,6 +86,6 @@
     public boolean showConstants;
     public boolean sysInfo;
     public boolean showInnerClasses;
-    public int indentWidth = 2;   // #spaces per indentWidth level
-    public int tabColumn = 40;    // column number for comments
+    public int indentWidth = 2;   // #spaces per indentWidth level; must be > 0
+    public int tabColumn = 40;    // column number for comments; must be > 0
 }
jdk-sandbox