Applying my second attempt at a patch to CLI-162. This fixes Gary's reported bug (one of which was an example of CLI-162, and one a bug in my first attempt to patch). Open question is whether to output text that is too long, or try and break it up to fit the screen width.

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

Author: hen

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

@@ -821,7 +821,6 @@ protected StringBuffer renderWrappedText(StringBuffer sb, int width,
 
         while (true)
         {
-            int lastPos = pos;
             text = padding + text.substring(pos).trim();
             pos = findWrapPos(text, width, 0);
 
@@ -830,10 +829,12 @@ protected StringBuffer renderWrappedText(StringBuffer sb, int width,
                 sb.append(text);
 
                 return sb;
-            } else
-            if (pos == lastPos)
-            {
-                throw new RuntimeException("Text too long for line - throwing exception to avoid infinite loop [CLI-162]: " + text);
+            }
+            
+            if ( (text.length() > width) && (pos == nextLineTabStop - 1) ) {
+                sb.append(text);
+
+                return sb;
             }
 
             sb.append(rtrim(text.substring(0, pos))).append(defaultNewLine);

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

@@ -42,11 +42,7 @@ public void setUp() {
     public void testInfiniteLoop() {
         HelpFormatter formatter = new HelpFormatter();
         formatter.setWidth(20);
-        try {
-            formatter.printHelp("app", options); // hang & crash
-        } catch(RuntimeException re) {
-            assertTrue(re.getMessage().startsWith("Text too long for line - throwing exception to avoid infinite loop [CLI-162]: "));
-        }
+        formatter.printHelp("app", options); // used to hang & crash
     }
 
     private void testPrintHelp(Options options) throws ParseException, IOException {