Author: markt Date: Sun Nov 1 19:58:24 2009 New Revision: 831751 URL: http://svn.apache.org/viewvc?rev=831751&view=rev Log: Fix bug in display name merge
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=831751&r1=831750&r2=831751&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/WebXml.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/WebXml.java Sun Nov 1 19:58:24 2009 @@ -620,8 +620,8 @@ } } } + displayName = temp.getDisplayName(); } - displayName = temp.getDisplayName(); if (distributable) { for (WebXml fragment : fragments) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org