Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50683

Scan annotations when unpackWars=false

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

diff --git a/java/org/apache/naming/resources/WARDirContext.java b/java/org/apache/naming/resources/WARDirContext.java
index 2015588..778c18c 100644 (file)
--- a/java/org/apache/naming/resources/WARDirContext.java
+++ b/java/org/apache/naming/resources/WARDirContext.java
@@ -471,6 +471,8 @@ public class WARDirContext extends BaseDirContext {
         attrs.setName(entry.getName());
         if (!zipEntry.isDirectory())
             attrs.setResourceType("");
+        else
+            attrs.setCollection(true);
         attrs.setContentLength(zipEntry.getSize());
         attrs.setLastModified(zipEntry.getTime());
         

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 07719b1..0491b6a 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -108,6 +108,11 @@
         WebappClassLoader since the thread that triggers the memory leak is
         created on demand. (markt)
       </fix>
+      <fix>
+        <bug>50683</bug>: Ensure annotations are scanned when upackWars is set
+        to <code>false</code> in the Host where a web application is deployed.
+        (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">