From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 1 Nov 2009 19:58:24 +0000 (+0000)
Subject: Fix bug in display name merge
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=dba8c5f157ed2b1ed92bfe2f212989450bc62af7;p=tomcat7.0

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 63ca166e4..49e38a066 100644
--- 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) {