Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ABD14DAB2 for ; Thu, 1 Nov 2012 18:14:16 +0000 (UTC) Received: (qmail 57795 invoked by uid 500); 1 Nov 2012 18:14:15 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 57583 invoked by uid 500); 1 Nov 2012 18:14:15 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 57509 invoked by uid 99); 1 Nov 2012 18:14:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Nov 2012 18:14:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Nov 2012 18:14:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4998623888FE for ; Thu, 1 Nov 2012 18:13:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1404704 - in /tomcat/trunk: java/org/apache/catalina/deploy/WebXml.java test/org/apache/catalina/deploy/TestWebXmlOrdering.java Date: Thu, 01 Nov 2012 18:13:21 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121101181321.4998623888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Thu Nov 1 18:13:20 2012 New Revision: 1404704 URL: http://svn.apache.org/viewvc?rev=1404704&view=rev Log: Handle case where relative ordering refers top fragments that are not present in the application Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1404704&r1=1404703&r2=1404704&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original) +++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Thu Nov 1 18:13:20 2012 @@ -2123,14 +2123,29 @@ public class WebXml { // Stage 1. Make all dependencies bi-directional - this makes the // next stage simpler. for (WebXml fragment : fragments.values()) { - for (String before : fragment.getBeforeOrdering()) { - if (!before.equals(ORDER_OTHERS)) { - fragments.get(before).addAfterOrdering(fragment.getName()); + Iterator before = + fragment.getBeforeOrdering().iterator(); + while (before.hasNext()) { + String beforeEntry = before.next(); + if (!beforeEntry.equals(ORDER_OTHERS)) { + WebXml beforeFragment = fragments.get(beforeEntry); + if (beforeFragment == null) { + before.remove(); + } else { + beforeFragment.addAfterOrdering(fragment.getName()); + } } } - for (String after : fragment.getAfterOrdering()) { - if (!after.equals(ORDER_OTHERS)) { - fragments.get(after).addBeforeOrdering(fragment.getName()); + Iterator after = fragment.getAfterOrdering().iterator(); + while (after.hasNext()) { + String afterEntry = after.next(); + if (!afterEntry.equals(ORDER_OTHERS)) { + WebXml afterFragment = fragments.get(afterEntry); + if (afterFragment == null) { + after.remove(); + } else { + afterFragment.addBeforeOrdering(fragment.getName()); + } } } } Modified: tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java?rev=1404704&r1=1404703&r2=1404704&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java (original) +++ tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java Thu Nov 1 18:13:20 2012 @@ -330,6 +330,11 @@ public class TestWebXmlOrdering { doRelativeOrderingTest(new RelativeTestRunner10()); } + @Test + public void testOrderWebFragmentsRelative11() { + // Test references to non-existant fragments + doRelativeOrderingTest(new RelativeTestRunner11()); + } @Test(expected=IllegalArgumentException.class) public void testOrderWebFragmentsrelativeCircular1() { @@ -673,4 +678,23 @@ public class TestWebXmlOrdering { assertTrue(order, posC > posB); } } + + private class RelativeTestRunner11 implements RelativeOrderingTestRunner { + + @Override + public void init() { + a.addAfterOrdering("b"); + b.addAfterOrdering("z"); + b.addBeforeOrdering("y"); + } + + @Override + public void validate(String order) { + // There is some duplication in the tests below - it is easier to + // check the tests are complete this way. + + // a.addAfterOrdering("b"); + assertTrue(order, posA > posB); + } + } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org