Return-Path: <akv@hyperreal.org>
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 3193 invoked by uid 2016); 5 Nov 1999 00:11:12 -0000
Delivered-To: apcore-jakarta-tomcat-cvs@apache.org
Received: (qmail 2982 invoked by uid 260); 5 Nov 1999 00:10:34 -0000
Date: 5 Nov 1999 00:10:34 -0000
Message-ID: <19991105001034.2975.qmail@hyperreal.org>
From: akv@hyperreal.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat/src/share/org/apache/jasper/compiler
 JspCompiler.java

akv         99/11/04 16:10:30

  Modified:    src/share/org/apache/jasper/compiler Tag:
                        TOMCAT_J2EE_10F_102199 JspCompiler.java
  Log:
  Fixed bug pointed out by gonzo. This has to do with a JSP file being mapped
  to some string that is < 4 chars. Example: a.b.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.1.1.2.1 +10 -5     jakarta-tomcat/src/share/org/apache/jasper/compiler/JspCompiler.java
  
  Index: JspCompiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspCompiler.java,v
  retrieving revision 1.1.1.1
  retrieving revision 1.1.1.1.2.1
  diff -u -r1.1.1.1 -r1.1.1.1.2.1
  --- JspCompiler.java	1999/10/09 00:20:36	1.1.1.1
  +++ JspCompiler.java	1999/11/05 00:10:22	1.1.1.1.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspCompiler.java,v 1.1.1.1 1999/10/09 00:20:36 duncan Exp $
  - * $Revision: 1.1.1.1 $
  - * $Date: 1999/10/09 00:20:36 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspCompiler.java,v 1.1.1.1.2.1 1999/11/05 00:10:22 akv Exp $
  + * $Revision: 1.1.1.1.2.1 $
  + * $Date: 1999/11/05 00:10:22 $
    *
    * ====================================================================
    * 
  @@ -209,8 +209,13 @@
       }
       
       private final String getBaseClassName() {
  -	String className
  -	    = jsp.getName().substring(0, jsp.getName().length() - 4);
  +	String className;
  +        
  +        if (jsp.getName().endsWith(".jsp"))
  +            className = jsp.getName().substring(0, jsp.getName().length() - 4);
  +        else
  +            className = jsp.getName();
  +            
   	
   	// Fix for invalid characters. If you think of more add to the list.
   	StringBuffer modifiedClassName = new StringBuffer();