From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 8 Dec 2010 11:36:49 +0000 (+0000)
Subject: Remove unused welcome file handling code
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=b52534b75a4b95d74eb936ab6935571989981614;p=tomcat7.0

Remove unused welcome file handling code

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1043364 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index a6245463d..5bc5cd39e 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -3021,7 +3021,6 @@ public class StandardContext extends ContainerBase
             results[welcomeFiles.length] = name;
             welcomeFiles = results;
         }
-        postWelcomeFiles();
         if(this.getState().equals(LifecycleState.STARTED))
             fireContainerEvent(ADD_WELCOME_FILE_EVENT, name);
     }
@@ -4115,7 +4114,6 @@ public class StandardContext extends ContainerBase
         }
 
         // Inform interested listeners
-        postWelcomeFiles();
         if(this.getState().equals(LifecycleState.STARTED))
             fireContainerEvent(REMOVE_WELCOME_FILE_EVENT, name);
 
@@ -4976,10 +4974,6 @@ public class StandardContext extends ContainerBase
                         JarScanner.class.getName(), getJarScanner());
             }
 
-            if (ok) {
-                postWelcomeFiles();
-            }
-            
             // Set up the context init params
             mergeParameters();
 
@@ -5655,17 +5649,6 @@ public class StandardContext extends ContainerBase
     }
 
 
-    /**
-     * Post a copy of our current list of welcome files as a servlet context
-     * attribute, so that the default servlet can find them.
-     */
-    private void postWelcomeFiles() {
-
-        getServletContext().setAttribute("org.apache.catalina.WELCOME_FILES",
-                                         welcomeFiles);
-
-    }
-
     public String getHostname() {
         Container parentHost = getParent();
         if (parentHost != null) {