You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by gl...@apache.org on 2001/09/10 17:21:02 UTC

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core ApplicationContext.java

glenn       01/09/10 08:21:02

  Modified:    catalina/src/share/org/apache/catalina/core
                        ApplicationContext.java
  Log:
  Bug fix, add path separator between host and path
  
  Revision  Changes    Path
  1.31      +7 -7      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
  
  Index: ApplicationContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- ApplicationContext.java	2001/07/25 04:25:58	1.30
  +++ ApplicationContext.java	2001/09/10 15:21:02	1.31
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v 1.30 2001/07/25 04:25:58 remm Exp $
  - * $Revision: 1.30 $
  - * $Date: 2001/07/25 04:25:58 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v 1.31 2001/09/10 15:21:02 glenn Exp $
  + * $Revision: 1.31 $
  + * $Date: 2001/09/10 15:21:02 $
    *
    * ====================================================================
    *
  @@ -113,7 +113,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.30 $ $Date: 2001/07/25 04:25:58 $
  + * @version $Revision: 1.31 $ $Date: 2001/09/10 15:21:02 $
    */
   
   public class ApplicationContext
  @@ -172,10 +172,9 @@
           }
   
           public Object run() throws Exception {
  -            return new URL("jndi", null, 0, "/" + host + path,
  +            return new URL("jndi", null, 0, "/" + host + "/" + path,
                      new DirContextURLStreamHandler(resources));
           }
  -
       }
   
   
  @@ -641,7 +640,8 @@
                           throw pe.getException();
                       }
                   } else {
  -                    return new URL("jndi", null, 0, "/" + hostName + fullPath,
  +                    return new URL("jndi", null, 0,
  +                                   "/" + hostName + "/" + fullPath,
                                      new DirContextURLStreamHandler(resources));
                   }
               } catch (Exception e) {