From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 29 Dec 2009 13:04:33 +0000 (+0000)
Subject: Fix copy/paste error
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=07dfde45a0102b1e1896122171234d26c49c5cb3;p=tomcat7.0

Fix copy/paste error

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

diff --git a/java/org/apache/catalina/startup/WebXml.java b/java/org/apache/catalina/startup/WebXml.java
index 20604afcb..09108628d 100644
--- a/java/org/apache/catalina/startup/WebXml.java
+++ b/java/org/apache/catalina/startup/WebXml.java
@@ -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())) {