cvs commit: jakarta-tomcat/src/facade22/org/apache/tomcat/facade JspInterceptor.java

[costin]

costin      01/02/10 18:24:27

  Modified:    src/facade22/org/apache/tomcat/facade JspInterceptor.java
  Log:
  In some strange cases, with JDK1.1 and the CryptoRealm I've got NPE.
  Checking doesn't hurt.
  
  Revision  Changes    Path
  1.14      +7 -2      
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/JspInterceptor.java
  
  Index: JspInterceptor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/JspInterceptor.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- JspInterceptor.java       2001/02/06 06:33:35     1.13
  +++ JspInterceptor.java       2001/02/11 02:24:26     1.14
  @@ -725,8 +725,10 @@
           URL commonCP[];
           serverCP=jdkProxy.getParentURLs(this.getClass().getClassLoader());
           commonCP=jdkProxy.getURLs(this.getClass().getClassLoader());
  -        cpath+=separator+extractClassPath(serverCP);
  -        cpath+=separator+extractClassPath(commonCP);
  +     if( serverCP!=null ) 
  +         cpath+=separator+extractClassPath(serverCP);
  +     if( commonCP!=null ) 
  +         cpath+=separator+extractClassPath(commonCP);
        return cpath;
       }
       String extractClassPath(URL urls[]){
  @@ -734,6 +736,9 @@
           String cpath="";
           for(int i=0; i< urls.length; i++ ) {
               URL cp = urls[i];
  +         if( cp == null ) {
  +             continue;
  +         }
               File f = new File( cp.getFile());
               if (cpath.length()>0) cpath += separator;
               cpath += f;
  
  
  

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