You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by sh...@locus.apache.org on 2000/03/07 00:59:36 UTC

cvs commit: jakarta-tomcat/src/share/org/apache/jasper JspC.java

shemnon     00/03/06 15:59:36

  Modified:    src/share/org/apache/jasper JspC.java
  Log:
  ng a "null." package name when no package name is speced.
  
  Revision  Changes    Path
  1.7       +9 -4      jakarta-tomcat/src/share/org/apache/jasper/JspC.java
  
  Index: JspC.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspC.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JspC.java	2000/03/04 06:29:10	1.6
  +++ JspC.java	2000/03/06 23:59:36	1.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspC.java,v 1.6 2000/03/04 06:29:10 shemnon Exp $
  - * $Revision: 1.6 $
  - * $Date: 2000/03/04 06:29:10 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspC.java,v 1.7 2000/03/06 23:59:36 shemnon Exp $
  + * $Revision: 1.7 $
  + * $Date: 2000/03/06 23:59:36 $
    *
    * ====================================================================
    * 
  @@ -340,8 +340,13 @@
   
               targetClassName = null;
               if (mapout != null) {
  -                String thisServletName = clc.getPackageName()
  +                String thisServletName;
  +		if  (clc.getPackageName == null) {
  +		    thisServletName = clc.getClassName();
  +		 } else {
  +		    thisServletName = clc.getPackageName()
                           + '.' + clc.getClassName();
  +		};
                   mapout.write("\n\t<servlet>\n\t\t<servlet-name>");
                   mapout.write(thisServletName);
                   mapout.write("</servlet-name>\n\t\t<servlet-class>");