svn commit: r1043364 - /tomcat/trunk/java/org/apache/catalina/core/StandardContext.java

[markt]

Author: markt
Date: Wed Dec  8 11:36:49 2010
New Revision: 1043364

URL: http://svn.apache.org/viewvc?rev=1043364&view=rev
Log:
Remove unused welcome file handling code

Modified:
    tomcat/trunk/java/org/apache/catalina/core/StandardContext.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1043364&r1=1043363&r2=1043364&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed Dec  8 
11:36:49 2010
@@ -3021,7 +3021,6 @@ public class StandardContext extends Con
             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 Con
         }
 
         // Inform interested listeners
-        postWelcomeFiles();
         if(this.getState().equals(LifecycleState.STARTED))
             fireContainerEvent(REMOVE_WELCOME_FILE_EVENT, name);
 
@@ -4976,10 +4974,6 @@ public class StandardContext extends Con
                         JarScanner.class.getName(), getJarScanner());
             }
 
-            if (ok) {
-                postWelcomeFiles();
-            }
-            
             // Set up the context init params
             mergeParameters();
 
@@ -5655,17 +5649,6 @@ public class StandardContext extends Con
     }
 
 
-    /**
-     * 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) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org