Fix copy/paste error
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Tue, 29 Dec 2009 13:04:33 +0000 (13:04 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Tue, 29 Dec 2009 13:04:33 +0000 (13:04 +0000)
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@894376 13f79535-47bb-0310-9956-ffa450edef68

java/org/apache/catalina/startup/WebXml.java

index 20604af..0910862 100644 (file)
@@ -1596,7 +1596,7 @@ public class WebXml {
         }
         
         if (dest.getLoadOnStartup() == null) {
-            dest.setLoadOnStartup(src.getServletClass());
+            dest.setLoadOnStartup(src.getLoadOnStartup().toString());
         } else if (src.getLoadOnStartup() != null) {
             if (failOnConflict &&
                     !src.getLoadOnStartup().equals(dest.getLoadOnStartup())) {