Applying additional patch to throw IllegalStateException when the specified width is not enough to fit the flags, indent and 1 character for the description. This closes out CLI-162 (for now :) ).

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/branches/cli-1.x@746137 13f79535-47bb-0310-9956-ffa450edef68

Author: hen

src/java/org/apache/commons/cli/HelpFormatter.java

@@ -819,6 +819,13 @@ protected StringBuffer renderWrappedText(StringBuffer sb, int width,
         // characters
         final String padding = createPadding(nextLineTabStop);
 
+        if (nextLineTabStop >= width)
+        {
+            // stops infinite loop happening
+            throw new IllegalStateException("Total width is less than the width of the argument and indent " + 
+                                            "- no room for the description");
+        }
+
         while (true)
         {
             text = padding + text.substring(pos).trim();

src/test/org/apache/commons/cli/bug/BugCLI162Test.java

@@ -259,6 +259,14 @@ public void testLongLineChunking() throws ParseException, IOException {
                           "                      yes.\n" +
                           "Footer\n";
         assertEquals( "Long arguments did not split as expected", expected, sw.toString() );
+
+        try {
+            formatter.printHelp(new PrintWriter(sw), 22, this.getClass().getName(), "Header", options, 0, 5, "Footer");
+            fail("IllegalStateException expected");
+        } catch(IllegalStateException ise) {
+            // expected
+        }
+
     }
 
 }