From b06f5eb3ad5d798cdf5e97e41e774d2f6e59aedb Mon Sep 17 00:00:00 2001
From: pero <pero@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 3 May 2010 09:44:39 +0000
Subject: [PATCH] Search to more jars and fix testcase!

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@940405 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/naming/resources/BaseDirContext.java |  10 +++++++---
 .../catalina/core/TestStandardContextResources.java |   2 +-
 .../webapp-3.0-fragments/WEB-INF/lib/resources2.jar | Bin 16262 -> 16260 bytes
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/naming/resources/BaseDirContext.java b/java/org/apache/naming/resources/BaseDirContext.java
index 1c48fe528..b388050e3 100644
--- a/java/org/apache/naming/resources/BaseDirContext.java
+++ b/java/org/apache/naming/resources/BaseDirContext.java
@@ -456,9 +456,13 @@ public abstract class BaseDirContext implements DirContext {
         
         // Check the alternate locations
         for (DirContext altDirContext : altDirContexts) {
-            obj = altDirContext.lookup("META-INF/resources/" + name);
-            if (obj != null)
-                return obj;
+            try {
+                obj = altDirContext.lookup("META-INF/resources/" + name);
+                if (obj != null)
+                    return obj;
+            } catch ( NamingException ex) {
+                // ignore
+            }
         }
         
         // Really not found
diff --git a/test/org/apache/catalina/core/TestStandardContextResources.java b/test/org/apache/catalina/core/TestStandardContextResources.java
index 92206d072..6a1fde1c3 100644
--- a/test/org/apache/catalina/core/TestStandardContextResources.java
+++ b/test/org/apache/catalina/core/TestStandardContextResources.java
@@ -84,7 +84,7 @@ public class TestStandardContextResources extends TomcatBaseTest {
         tomcat.start();
 
         assertPageContains("/test/getresource?path=/resourceF.jsp",
-                "<p>resourceF.jsp in the web application</p>");
+                "<p>resourceF.jsp in resources2.jar</p>");
         assertPageContains("/test/getresource?path=/resourceA.jsp",
                 "<p>resourceA.jsp in the web application</p>");
         assertPageContains("/test/getresource?path=/resourceB.jsp",
diff --git a/test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar b/test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar
index 66155767de2189b8826ff58bb7b4f085d822fb9d..62a41a913ddfe1167906cc82fef16e689b46858c 100644
GIT binary patch
delta 655
zcmV;A0&x9?e}sPxP)h>@6aWYS2mnW2qmd0d14mt>u}V%j120{plbbj$120{plgv0X
zf8TGLFc5x^l>gxrsZuKiGWBtbD$zF4&?+JYx+sqhT)-XJo^3|+-|r4W%QRk)&E0q3
zk7Iok1oIiZ$Q+f!0=x!aAw)*x^h)*FcfulUb*l>DrB-korQ188BU;c3L0f3FMFN3b
zD{tkg^>kMch#*Rf*r4(*1V|Bk_+*#Ge@`1Y%Nn7OZfK(Eo%9t0`ARzIwEYEVf)Yg`
zd9<iOD!OO}A{I+w3#m$)Yc5unl?UA^w62mSWSESVq}!2;8*uxnr1PlTtBi@_s}W21
zNjN;^KK#N^w_LNheqG#sg9~*x;sQ#0XdO<V@jXZ5i7N4GOf7}VaiZ*F2KjNke}d?f
z7gR5LC7{pKG7x?~<5qqu@6FfMs_VK?^n^og%hjlF^+K*D=_cq&bI+@)(K)i}cPlL!
ze7b-z#3>giVp@xi<Le{pqbClXC9hSv1b5AzVWt^<S~e0S;nM;#O(<AIDa7dl9-}l)
zmke@<v+ujt3=YwLA0=75Nny8#f2UpY9B1(^q0<(k<Oo0F<ar55hS3~+H<lF;P040r
z(I-1D(nx{VgwM`kF3&P2X{u~RiBRf4XccdXLEA{jp*kX1Fib5Q>HBSR|LdYbL2&ah
zpRI>~1or53YbnfOgDT-!I`gCTX79N9uz3vPWJ{TxR`%N9?!z}>hc>P1Aj>DRc^GT9
z;hQrI@^906WvK2iP)i30z<oUn5dr`Jrn4P8&H@8RU89rkJvakLU89pJK79i(U89q!
pK0XaEU86j}eLV{i0ssJ}lk`4c0v<b)JUbhca6b?R-8}#R002GzC&mB(

delta 657
zcmV;C0&e|;e};bzP)h>@6aWYS2mr=#o{<eY1IBQku}V%j1F>+Plbbj$1F>+Plgv0X
ze_?B*KoI>N$bT3Dg%+Y7{dgA&woN#>Vj$XveB9_nx2L;%yX)Ef`<v0&2F@?C>%2Gb
zy%|?GK`@`ei!4w%EWvB=H9~AeL9a}od@n4*Mt7<dUTOumakjYwI-&)w5VVC>TO<-F
zwDMLSJ5P7b$Oxjch%GAbLVyf$pij4XfAX}3lWY)5=|&KB@1?Jq$k)<AukCL*5tS%Q
z$*n~LQqe^_3b9xTTS`??Uvsvysy*mlp>?%1A=BjSB->0{+{in0C7%b~U2I%Az67y^
zH{#(g_u)6Dy5*Y1<?G_^2b>AriZdwfp>udejUNRXPf|%&YZ@t3fmhBxdr%&Se+!8|
zdO`JKa02>tT?WF>XAI@1_TGGtqQ37#F$fN|t)j_a^g^ko**X|RGv-w_=p04$r<0Zf
zKAu4s(o~2eDQ!g0;~PdajGi>~ma<mW65M6>OmjV>ugE5WWc<2-LK6xWaRy1YfX6sX
zvL%!3ll<rQHHUq?+r?>~tTWi|f8c4GJ|}syP3g3OI6c6xBz;~2Qee~vKa6DuBvW#j
zSPqk&7HN{eYr<z|u#hKNkTq3xqC%+jU$lz1#Gq}Z<DohdSTao`Tj_^wa{v3HMnQ1%
zFrTf)e*|{ubZ2Rp;|A5jvvt-->&@9Qc)xxOl5|5eIY#yZaQET6up>;XBIf+XY#yeX
zP5AB%lYD|0vx*Fr{R2=-2MB2K56u$-005=48#~Sd1IBQklk7b>1IBQklP5lX1F>+P
rlczpD4Y6>ZJZSL`%@YCu0Hu@iK3@VLJCiy)8<TE75C-2p00000h!8D)

-- 
2.11.0