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

[craigmcc]

craigmcc    01/04/25 10:17:52

  Modified:    catalina/src/share/org/apache/catalina/core
                        ApplicationContext.java
  Log:
  Correct the paths returned by ServletContext.getResourcePaths("/"), which
  formerly had an extra "/" prepended.  Also, eliminate string concatenations
  to make it a little more efficient.
  
  Revision  Changes    Path
  1.21      +10 -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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ApplicationContext.java   2001/04/25 04:14:26     1.20
  +++ ApplicationContext.java   2001/04/25 17:17:49     1.21
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
 1.20 2001/04/25 04:14:26 glenn Exp $
  - * $Revision: 1.20 $
  - * $Date: 2001/04/25 04:14:26 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
 1.21 2001/04/25 17:17:49 craigmcc Exp $
  + * $Revision: 1.21 $
  + * $Date: 2001/04/25 17:17:49 $
    *
    * ====================================================================
    *
  @@ -111,7 +111,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.20 $ $Date: 2001/04/25 04:14:26 $
  + * @version $Revision: 1.21 $ $Date: 2001/04/25 17:17:49 $
    */
   
   public final class ApplicationContext
  @@ -904,12 +904,15 @@
           while (childPaths.hasMoreElements()) {
               Binding binding = (Binding) childPaths.nextElement();
               String name = binding.getName();
  -            String childPath = path + "/" + name;
  +            StringBuffer childPath = new StringBuffer(path);
  +            if (!"/".equals(path))
  +                childPath.append("/");
  +            childPath.append(name);
               Object object = binding.getObject();
               if (object instanceof DirContext) {
  -                childPath = childPath + "/";
  +                childPath.append("/");
               }
  -            set.add(childPath);
  +            set.add(childPath.toString());
           }
   
       }