Fix bug in display name merge

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

diff --git a/java/org/apache/catalina/startup/WebXml.java b/java/org/apache/catalina/startup/WebXml.java
index 63ca166..49e38a0 100644 (file)
--- a/java/org/apache/catalina/startup/WebXml.java
+++ b/java/org/apache/catalina/startup/WebXml.java
@@ -620,8 +620,8 @@ public class WebXml {
                     }
                 }
             }
+            displayName = temp.getDisplayName();
         }
-        displayName = temp.getDisplayName();
 
         if (distributable) {
             for (WebXml fragment : fragments) {