tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Catalina.java
Date Wed, 23 May 2001 22:06:34 GMT
craigmcc    01/05/23 15:06:33

  Modified:    catalina/src/share/org/apache/catalina/startup Catalina.java
  Log:
  If an attempt is made to execute Catalina with no command line parameters
  at all (or an unrecognized parameter), display a usage message and exit.
  
  PR:  Patch #3 of the "8 Patches" email on 23 May 2001
  Submitted by: Peter Costello <peterwcostello@yahoo.com>
  
  Revision  Changes    Path
  1.22      +10 -4     jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java
  
  Index: Catalina.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Catalina.java	2001/05/04 20:45:55	1.21
  +++ Catalina.java	2001/05/23 22:06:31	1.22
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.21 2001/05/04 20:45:55 bip Exp $
  - * $Revision: 1.21 $
  - * $Date: 2001/05/04 20:45:55 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.22 2001/05/23 22:06:31 craigmcc Exp $
  + * $Revision: 1.22 $
  + * $Date: 2001/05/23 22:06:31 $
    *
    * ====================================================================
    *
  @@ -97,7 +97,7 @@
    * </u>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.21 $ $Date: 2001/05/04 20:45:55 $
  + * @version $Revision: 1.22 $ $Date: 2001/05/23 22:06:31 $
    */
   
   public class Catalina {
  @@ -223,6 +223,11 @@
   
   	boolean isConfig = false;
   
  +        if (args.length < 1) {
  +            usage();
  +            return (false);
  +        }
  +
   	for (int i = 0; i < args.length; i++) {
   	    if (isConfig) {
   		configFile = args[i];
  @@ -242,6 +247,7 @@
   	        stopping = true;
   	    } else {
   		usage();
  +                return (false);
   	    }
   	}
   
  
  
  

Mime
View raw message