Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 78332 invoked from network); 2 Jan 2008 16:05:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Jan 2008 16:05:38 -0000 Received: (qmail 80519 invoked by uid 500); 2 Jan 2008 16:05:26 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 80469 invoked by uid 500); 2 Jan 2008 16:05:26 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 80458 invoked by uid 99); 2 Jan 2008 16:05:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 08:05:26 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 16:05:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 113DC1A9838; Wed, 2 Jan 2008 08:05:15 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r608138 - /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java Date: Wed, 02 Jan 2008 16:05:14 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080102160515.113DC1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Wed Jan 2 08:05:13 2008 New Revision: 608138 URL: http://svn.apache.org/viewvc?rev=608138&view=rev Log: prevent java.lang.StringIndexOutOfBoundsException from startup progress monitor when lots of modules are installed. Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java?rev=608138&r1=608137&r2=608138&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java Wed Jan 2 08:05:13 2008 @@ -175,7 +175,13 @@ } buf.append(time).append("s "); if (currentOperation.length() > operationLimit) { - buf.append(currentOperation.substring(0, operationLimit - 3)).append("..."); + if (operationLimit > 3) { + buf.append(currentOperation.substring(0, operationLimit - 3)).append("..."); + } else { + for (int i = 0; i < operationLimit; i++) { + buf.append('.'); + } + } // int space = currentOperation.indexOf(' ', 5); // buf.append(currentOperation.substring(0, space + 1)); // "Foo BarBarBar" limit 9 = "Foo ...ar" = 13 - 9 + 3 + 1 + 3