Author: violetagg
Date: Wed May 11 20:27:58 2016
New Revision: 1743425
URL: http://svn.apache.org/viewvc?rev=1743425&view=rev
Log:
Ensure that annotated web components packed in web fragments will be processed
when <code>unpackWARs</code> is enabled. This is a regression caused by
r1742160.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1743425&r1=1743424&r2=1743425&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Wed May 11
20:27:58 2016
@@ -1955,7 +1955,7 @@ public class ContextConfig implements Li
if (url == null) {
// Nothing to do.
return;
- } else if ("jar".equals(url.getProtocol())) {
+ } else if ("jar".equals(url.getProtocol()) ||
url.toString().endsWith(".jar")) {
processAnnotationsJar(url, fragment, handlesTypesOnly,
javaClassCache);
} else if ("file".equals(url.getProtocol())) {
try {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1743425&r1=1743424&r2=1743425&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed May 11 20:27:58 2016
@@ -45,6 +45,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 9.0.0.M6" rtext="In development">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Ensure that annotated web components packed in web fragments will be
+ processed when <code>unpackWARs</code> is enabled. (violetagg)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.0.M5" rtext="Release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
