Author: markt
Date: Sat Jan 29 00:15:34 2011
New Revision: 1064934
URL: http://svn.apache.org/viewvc?rev=1064934&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50683
Scan annotations when unpackWars=false
Modified:
tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java?rev=1064934&r1=1064933&r2=1064934&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java Sat Jan 29
00:15:34 2011
@@ -471,6 +471,8 @@ public class WARDirContext extends BaseD
attrs.setName(entry.getName());
if (!zipEntry.isDirectory())
attrs.setResourceType("");
+ else
+ attrs.setCollection(true);
attrs.setContentLength(zipEntry.getSize());
attrs.setLastModified(zipEntry.getTime());
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1064934&r1=1064933&r2=1064934&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Jan 29 00:15:34 2011
@@ -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">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
