markt       2005/03/07 13:57:45

  Modified:    jasper2/src/share/org/apache/jasper Tag: tomcat_4_branch
                        JspC.java
  Log:
  Fix bug 22293 by applying Jean-Frederic's suggested patch.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.12.2.12 +2 -0      
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java
  
  Index: JspC.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java,v
  retrieving revision 1.12.2.11
  retrieving revision 1.12.2.12
  diff -u -r1.12.2.11 -r1.12.2.12
  --- JspC.java 12 Sep 2004 21:59:40 -0000      1.12.2.11
  +++ JspC.java 7 Mar 2005 21:57:45 -0000       1.12.2.12
  @@ -489,6 +489,8 @@
                   String jspPackage = toPackageName(jspUri);
                   if (jspPackage.equals("")) {
                       clctxt.setServletPackageName(targetPackage);
  +                } else if (targetPackage.equals(Constants.JSP_PACKAGE_NAME)) 
{
  +                    clctxt.setServletPackageName(targetPackage);
                   } else {
                       clctxt.setServletPackageName(targetPackage + "." 
                                                    + jspPackage);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to