Fix bug in display name merge
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Sun, 1 Nov 2009 19:58:24 +0000 (19:58 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Sun, 1 Nov 2009 19:58:24 +0000 (19:58 +0000)
commitdba8c5f157ed2b1ed92bfe2f212989450bc62af7
tree8bfdf750ad1bee86927bf539e382466134122f22
parenta5bfb8f3eeef25408055912a99d01661b384c3a7
Fix bug in display name merge

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@831751 13f79535-47bb-0310-9956-ffa450edef68
java/org/apache/catalina/startup/WebXml.java