Return-Path: Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org Received: (qmail 35895 invoked by uid 500); 19 Mar 2003 11:53:05 -0000 Mailing-List: contact cvs-help@avalon.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon CVS List" Reply-To: "Avalon Developers List" Delivered-To: mailing list cvs@avalon.apache.org Received: (qmail 35884 invoked by uid 500); 19 Mar 2003 11:53:05 -0000 Received: (qmail 35881 invoked from network); 19 Mar 2003 11:53:05 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 19 Mar 2003 11:53:05 -0000 Received: (qmail 31217 invoked by uid 1433); 19 Mar 2003 11:53:05 -0000 Date: 19 Mar 2003 11:53:05 -0000 Message-ID: <20030319115305.31215.qmail@icarus.apache.org> From: leif@apache.org To: avalon-excalibur-cvs@apache.org Subject: cvs commit: avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client Main.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N leif 2003/03/19 03:53:04 Modified: instrument-client/src/java/org/apache/excalibur/instrument/client Main.java Log: Fix a NPE that would be thrown if both -debug and a conf file were specified on the command line. Revision Changes Path 1.5 +2 -2 avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/Main.java Index: Main.java =================================================================== RCS file: /home/cvs/avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/Main.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Main.java 5 Nov 2002 02:59:04 -0000 1.4 +++ Main.java 19 Mar 2003 11:53:04 -0000 1.5 @@ -70,7 +70,7 @@ showUsage(); System.exit( 1 ); } - defaultStateFileName = args[0]; + defaultStateFileName = args[1]; break; default: --------------------------------------------------------------------- To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org For additional commands, e-mail: cvs-help@avalon.apache.org