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

[costin]

costin      01/09/06 21:35:27

  Modified:    src/facade22/org/apache/tomcat/facade
                        Servlet22Interceptor.java
               src/share/org/apache/jasper/compiler JasperMangler.java
  Log:
  Minors - one extra debug ( usefull ) in S22, workaround for a common config error in
  jasper mangler.
  
  Revision  Changes    Path
  1.17      +2 -0      
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/Servlet22Interceptor.java
  
  Index: Servlet22Interceptor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/Servlet22Interceptor.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Servlet22Interceptor.java 2001/08/12 02:00:23     1.16
  +++ Servlet22Interceptor.java 2001/09/07 04:35:27     1.17
  @@ -188,6 +188,8 @@
                Object value = sess.getAttribute(key);
   
                if( value instanceof  HttpSessionBindingListener) {
  +                 if( debug > 0 )
  +                     log("valueUnbound " + sess.getId() + " " + key );
                    ((HttpSessionBindingListener) value).valueUnbound
                        (new HttpSessionBindingEvent(httpSess , key));
                    if( removed==null) removed=new Vector();
  
  
  
  1.7       +2 -2      
jakarta-tomcat/src/share/org/apache/jasper/compiler/JasperMangler.java
  
  Index: JasperMangler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JasperMangler.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JasperMangler.java        2001/08/03 02:39:23     1.6
  +++ JasperMangler.java        2001/09/07 04:35:27     1.7
  @@ -241,12 +241,12 @@
            if( lastComp > 0 )
                baseClassN=jspFile.substring( lastComp+1 );
            else
  -             baseClassN=jspFile.substring( 1 );
  +             baseClassN=jspFile.substring( 0 );
        } else {
            if( lastComp > 0 )
                baseClassN=jspFile.substring( lastComp+1, extIdx );
            else
  -             baseClassN=jspFile.substring( 1, extIdx );
  +             baseClassN=jspFile.substring( 0, extIdx );
        }
   
        if( JavaGeneratorTool.isKeyword( baseClassN ) )