tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r894376 - /tomcat/trunk/java/org/apache/catalina/startup/WebXml.java
Date Tue, 29 Dec 2009 13:04:34 GMT
Author: markt
Date: Tue Dec 29 13:04:33 2009
New Revision: 894376

URL: http://svn.apache.org/viewvc?rev=894376&view=rev
Log:
Fix copy/paste error

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/WebXml.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/WebXml.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebXml.java?rev=894376&r1=894375&r2=894376&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebXml.java Tue Dec 29 13:04:33 2009
@@ -1596,7 +1596,7 @@
         }
         
         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())) {



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


Mime
View raw message