[Bug 57251] WAR deployment unbelievably slow when unpackWARs=false
https://issues.apache.org/bugzilla/show_bug.cgi?id=57251 --- Comment #13 from Mark Thomas --- Indeed. Hence my question about use cases. I would note that there are many folks that are less concerned about slow deployment as long as performance once deployed is acceptable. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55988] Add parameter useCipherSuitesOrder to JSSE (BIO and NIO) connectors [PATCH]
https://issues.apache.org/bugzilla/show_bug.cgi?id=55988 --- Comment #13 from Ralf Hauser --- getting as many clients to choose a forward-secret cipher even if their makers didn't think of putting forward-secret ciphers highest priority is important in today's world of massive eaves-dropping. Please implement this feature also for non-APR connectors A.S.A.P. - I think it is even worthwhile to backport to Tomcat 7! -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1655224 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java webapps/docs/changelog.xml
Author: kfujino
Date: Wed Jan 28 06:04:58 2015
New Revision: 1655224
URL: http://svn.apache.org/r1655224
Log:
Fix a possible deadlock when receiver thread invokes mapMemberAdded() while
ping thread invokes memberAlive().
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1655224&r1=1655223&r2=1655224&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Wed Jan 28 06:04:58 2015
@@ -300,10 +300,8 @@ public abstract class AbstractReplicated
* @param member Member
*/
protected void memberAlive(Member member) {
+mapMemberAdded(member);
synchronized (mapMembers) {
-if (!mapMembers.containsKey(member)) {
-mapMemberAdded(member);
-} //end if
mapMembers.put(member, new Long(System.currentTimeMillis()));
}
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1655224&r1=1655223&r2=1655224&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan 28 06:04:58 2015
@@ -55,6 +55,17 @@
They eventually become mixed with the numbered issues. (I.e., numbered
issues to not "pop up" wrt. others).
-->
+
+
+
+
+Fix a possible deadlock when receiver thread invokes
+mapMemberAdded() while ping thread invokes
+memberAlive(). (kfujino)
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1655223 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java webapps/docs/changelog.xml
Author: kfujino
Date: Wed Jan 28 06:02:29 2015
New Revision: 1655223
URL: http://svn.apache.org/r1655223
Log:
Fix a possible deadlock when receiver thread invokes mapMemberAdded() while
ping thread invokes memberAlive().
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1655223&r1=1655222&r2=1655223&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Wed Jan 28 06:02:29 2015
@@ -293,10 +293,8 @@ public abstract class AbstractReplicated
* @param member Member
*/
protected void memberAlive(Member member) {
+mapMemberAdded(member);
synchronized (mapMembers) {
-if (!mapMembers.containsKey(member)) {
-mapMemberAdded(member);
-} //end if
mapMembers.put(member, new Long(System.currentTimeMillis()));
}
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1655223&r1=1655222&r2=1655223&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Jan 28 06:02:29 2015
@@ -82,6 +82,15 @@
+
+
+
+Fix a possible deadlock when receiver thread invokes
+mapMemberAdded() while ping thread invokes
+memberAlive(). (kfujino)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1655222 - /tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Author: kfujino
Date: Wed Jan 28 05:59:49 2015
New Revision: 1655222
URL: http://svn.apache.org/r1655222
Log:
Fix a possible deadlock when receiver thread invokes mapMemberAdded() while
ping thread invokes memberAlive().
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1655222&r1=1655221&r2=1655222&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Wed Jan 28 05:59:49 2015
@@ -293,10 +293,8 @@ public abstract class AbstractReplicated
* @param member Member
*/
protected void memberAlive(Member member) {
+mapMemberAdded(member);
synchronized (mapMembers) {
-if (!mapMembers.containsKey(member)) {
-mapMemberAdded(member);
-} //end if
mapMembers.put(member, new Long(System.currentTimeMillis()));
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1655215 - in /tomcat/maven-plugin/branches/tc8.x: pom.xml tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java tomcat8-maven-plugin/src/main/java/org/
Author: olamy
Date: Wed Jan 28 03:46:57 2015
New Revision: 1655215
URL: http://svn.apache.org/r1655215
Log:
upgrade surefire, use default log file name
Modified:
tomcat/maven-plugin/branches/tc8.x/pom.xml
tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
Modified: tomcat/maven-plugin/branches/tc8.x/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/pom.xml?rev=1655215&r1=1655214&r2=1655215&view=diff
==
--- tomcat/maven-plugin/branches/tc8.x/pom.xml (original)
+++ tomcat/maven-plugin/branches/tc8.x/pom.xml Wed Jan 28 03:46:57 2015
@@ -48,7 +48,7 @@
3.2
false
-2.17
+2.18.1
${surefire.version}
4.10
Modified:
tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java?rev=1655215&r1=1655214&r2=1655215&view=diff
==
---
tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
(original)
+++
tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
Wed Jan 28 03:46:57 2015
@@ -134,8 +134,6 @@ public abstract class AbstractWarProject
verifier.setCliOptions( getCliOptions() );
-verifier.setLogFileName( "foo.log" );
-
verifier.executeGoal( getGoal() );
verifier.displayStreamBuffers();
Modified:
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java?rev=1655215&r1=1655214&r2=1655215&view=diff
==
---
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
(original)
+++
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
Wed Jan 28 03:46:57 2015
@@ -22,6 +22,7 @@ import org.apache.catalina.Context;
import org.apache.catalina.WebResource;
import org.apache.catalina.WebResourceRoot;
import org.apache.catalina.WebResourceSet;
+import org.apache.catalina.loader.WebappClassLoaderBase;
import org.apache.catalina.loader.WebappLoader;
import org.apache.catalina.webresources.EmptyResource;
import org.apache.catalina.webresources.FileResource;
@@ -344,8 +345,6 @@ public class RunMojo
final ClassRealm pluginRealm = getTomcatClassLoader();
-final WebResourceRoot previous = context.getResources();
-
context.setResources(
new MyDirContext( new File(
project.getBuild().getOutputDirectory() ).getAbsolutePath(), //
getPath(), //
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57508] New: tomcat-8.0.17 Unable to compile class for JSP on JDK8
https://issues.apache.org/bugzilla/show_bug.cgi?id=57508
Bug ID: 57508
Summary: tomcat-8.0.17 Unable to compile class for JSP on JDK8
Product: Tomcat 8
Version: 8.0.17
Hardware: PC
OS: Linux
Status: NEW
Severity: major
Priority: P2
Component: Jasper
Assignee: dev@tomcat.apache.org
Reporter: conquer0...@163.com
1.I use jdk8, define a interface named TestInterface:
package test;
public interface TestInterface {
public static String test() {
return "*";
}
}
2.use this interface in my jsp named test.jsp:
<%@ page import="test.TestInterface" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%
TestInterface.test();
%>
3.access the test.jsp, occur errors below:
org.apache.jasper.JasperException: Unable to compile class for JSP:
An error occurred at line: 9 in the jsp file: /b.jsp
This static method of interface TestInterface can only be accessed as
TestInterface.test
6:
7:
8: <%
9: TestInterface.test();
10: %>
11:
12:
Stacktrace:
org.apache.jasper.compiler.DefaultErrorHandler.javacError(DefaultErrorHandler.java:102)
org.apache.jasper.compiler.ErrorDispatcher.javacError(ErrorDispatcher.java:198)
org.apache.jasper.compiler.JDTCompiler.generateClass(JDTCompiler.java:450)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:361)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:336)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:323)
org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:570)
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:356)
org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:396)
org.apache.jasper.servlet.JspServlet.service(JspServlet.java:340)
javax.servlet.http.HttpServlet.service(HttpServlet.java:725)
org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52)
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57465] Build TC Native with with latest OpenSSL to address CVEs
https://issues.apache.org/bugzilla/show_bug.cgi?id=57465 Brett Randall changed: What|Removed |Added CC||javabr...@gmail.com -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57251] WAR deployment unbelievably slow when unpackWARs=false
https://issues.apache.org/bugzilla/show_bug.cgi?id=57251 --- Comment #12 from Francisco A. Lozano --- One question about your reasoning - what's the point of having unpackWARS="false" option if it's so unusably slow in T8? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57507] New: Deploying new Context fails if the context file is already present in the catalina directory
https://issues.apache.org/bugzilla/show_bug.cgi?id=57507 Bug ID: 57507 Summary: Deploying new Context fails if the context file is already present in the catalina directory Product: Tomcat 7 Version: 7.0.55 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: joekis...@gmail.com Deploying new Context fails if the context file is already present in the catalina directory This worked in 7.0.52, and does not work in 7.0.55 and 7.0.57. I did not test the intervening verions to figure out which release introduced the issue. Here's how to reproduce: 1) Start tomcat 2) Place a new context file into the catalina context directory here: /var/lib/tomcat/conf/Catalina/localhost/test.xml 3) Tell tomcat there's a new context: Goto URL: http://webserver/tomcat-manager-app/deploy?path=/test&config=file:///var/lib/tomcat/conf/Catalina/localhost/test.xml"; 4) Deploy fails with this message: FAIL - Failed to deploy application at context path /test Previously it would deploy fine. It appears that deploying does not work if the source of your context file is it's final destination. I traced a chunk of the code, and this is being caught by a generic "something bad happened during the deploy"... I didn't see any useful debug messages or why it's failing. After it fails, it deletes the test.xml file. A work around would be to create a secure temporary directory to write the context files to and give that path to catalina. Unfortunately that workaround isn't terribly exciting for us for a few reasons: 1) We need to be able to deploy context's when tomcat is not running, and we do that by writing the context file in directly 2) Creating a single purpose secure temporary directory with the correct permissions, owner and group would be cumbersome to create and manage 3) After tomcat copies the context file, we would need to manage the ownership and permissions of the context files. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57251] WAR deployment unbelievably slow when unpackWARs=false
https://issues.apache.org/bugzilla/show_bug.cgi?id=57251 --- Comment #11 from Mark Thomas --- (In reply to Francisco A. Lozano from comment #10) > The deploy/redeploy tooling we have had around since tomcat 6 works that > way, and it's easier to manage just a WAR file in webapps than a WAR file > and a exploded directory. I seem to recall that keeping them in sync was > problematic, as tomcat may be down when the WAR is reinstalled. Yes, that can be a problem. Tomcat doesn't detect that the WAR is newer than the exploded directory. > I think there is value in existing tomcat6/7 behaviour - the "interface" > that users have to deal with is just simpler, and it makes it more difficult > to shoot yourself in the foot without paying performance penalty. Keep in mind you are still paying the performance penalty for at least the first load all your static resources (although they are normally then cached in memory which will help until the cache expires). > In T8, the current options are either large performance penalty paid or > having to deal with a slightly more complex deployment. > > I understand the 'unpackWARS="false" really should mean exactly that' > statement, but existing behaviour in T6/7 is valuable and is relied upon - > so maybe the new 'really don't unpack anything' behaviour could be a > separate feature, but existing one in my opinion should still be available. That would mean adding back in the "unpack the JARs anyway if unpackWARs is false" feature which is do-able but would add complexity to an area where I have been trying to reduce it. Given the use case, I'm wondering if making Tomcat's auto-deployment code smart enough to detect that the WAR has been updated even if Tomcat is not running might be a better solution. Something along the lines of a file in the work directory configured with the same last modified time as the WAR. A simple comparison of the last modified time of the two files tells Tomcat if a redploy is required on start. I did think about caching the JARs in memory (probably only during web application start) but for some applications that could mean significant increases in the memory footprint just to start. I suspect this might cause as many problems as it solves. Overall, I'm leaning towards a position of finding a better solution to the use cases that mean folks opt to run with unpackWARs set to false. I'd be interested in hearing if there are any other use cases. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57251] WAR deployment unbelievably slow when unpackWARs=false
https://issues.apache.org/bugzilla/show_bug.cgi?id=57251 --- Comment #10 from Francisco A. Lozano --- The deploy/redeploy tooling we have had around since tomcat 6 works that way, and it's easier to manage just a WAR file in webapps than a WAR file and a exploded directory. I seem to recall that keeping them in sync was problematic, as tomcat may be down when the WAR is reinstalled. I think there is value in existing tomcat6/7 behaviour - the "interface" that users have to deal with is just simpler, and it makes it more difficult to shoot yourself in the foot without paying performance penalty. In T8, the current options are either large performance penalty paid or having to deal with a slightly more complex deployment. I understand the 'unpackWARS="false" really should mean exactly that' statement, but existing behaviour in T6/7 is valuable and is relied upon - so maybe the new 'really don't unpack anything' behaviour could be a separate feature, but existing one in my opinion should still be available. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat 8.0.18 available
The Apache Tomcat team announces the immediate availability of Apache Tomcat 8.0.18. Apache Tomcat 8 is an open source software implementation of the Java Servlet, JavaServer Pages, Java Unified Expression Language and Java WebSocket technologies. Apache Tomcat 8.0.18 includes numerous fixes for issues identified in 8.0.17 as well as a number of other enhancements and changes. The notable changes since 8.0.17 include: - A regression that caused response truncation when using forwarding (bug 57475) has been fixed. - Various improvements to ReplicatedMap in Tribes. Please refer to the change log for the complete list of changes: http://tomcat.apache.org/tomcat-8.0-doc/changelog.html Downloads: http://tomcat.apache.org/download-80.cgi Migration guides from Apache Tomcat 5.5.x, 6.0.x and 7.0.x: http://tomcat.apache.org/migration.html Enjoy! - The Apache Tomcat team - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57489] java.util.concurrent.ExecutionException: java.io.IOException: Key must be cancelled
https://issues.apache.org/bugzilla/show_bug.cgi?id=57489 --- Comment #3 from Jean-Francois Arcand --- @Mark, I did hack a little to prevent that error (which I may not fixed completely) https://github.com/Atmosphere/atmosphere/issues/1646 The stack trave will probably help you. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1655152 [1/2] - in /tomcat/site/trunk: ./ docs/ xdocs/
Author: markt Date: Tue Jan 27 20:30:18 2015 New Revision: 1655152 URL: http://svn.apache.org/r1655152 Log: Update for 8.0.18 release Added: tomcat/site/trunk/docs/oldnews-2014.html (with props) tomcat/site/trunk/xdocs/oldnews-2014.xml - copied, changed from r1655136, tomcat/site/trunk/xdocs/oldnews.xml Modified: tomcat/site/trunk/build.properties.default tomcat/site/trunk/docs/doap_Tomcat.rdf tomcat/site/trunk/docs/download-80.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/migration-8.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/doap_Tomcat.rdf tomcat/site/trunk/xdocs/download-80.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/migration-8.xml tomcat/site/trunk/xdocs/oldnews.xml tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1655152&r1=1655151&r2=1655152&view=diff == --- tomcat/site/trunk/build.properties.default (original) +++ tomcat/site/trunk/build.properties.default Tue Jan 27 20:30:18 2015 @@ -38,7 +38,7 @@ tomcat.loc=http://www.apache.org/dist/to # - Tomcat versions - tomcat60=6.0.43 tomcat70=7.0.57 -tomcat80=8.0.17 +tomcat80=8.0.18 # - Download destination - Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1655152&r1=1655151&r2=1655152&view=diff == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Tue Jan 27 20:30:18 2015 @@ -57,8 +57,8 @@ Latest Stable 8.0.x Release -2015-01-15 -8.0.17 +2015-01-26 +8.0.18 Modified: tomcat/site/trunk/docs/download-80.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1655152&r1=1655151&r2=1655152&view=diff == --- tomcat/site/trunk/docs/download-80.html (original) +++ tomcat/site/trunk/docs/download-80.html Tue Jan 27 20:30:18 2015 @@ -203,7 +203,7 @@ Quick Navigation -[define v]8.0.17[end] +[define v]8.0.18[end] https://www.apache.org/dist/tomcat/tomcat-8/KEYS";>KEYS | [v] | Browse | Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1655152&r1=1655151&r2=1655152&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Tue Jan 27 20:30:18 2015 @@ -224,38 +224,29 @@ project logo are trademarks of the Apach - -2015-01-15 Tomcat 8.0.17 Released + +2015-01-26 Tomcat 8.0.18 Released -The Apache Tomcat Project is proud to announce the release of version 8.0.17 -of Apache Tomcat. Apache Tomcat 8.0.17 includes numerous fixes for issues -identified in 8.0.15 as well as a number of other enhancements and changes. The -notable changes since 8.0.15 include: +The Apache Tomcat Project is proud to announce the release of version 8.0.18 +of Apache Tomcat. Apache Tomcat 8.0.18 includes a numerous fixes for issues +identified in 8.0.17 as well as a number of other enhancements and changes. The +notable changes since 8.0.17 include: -Fixing a regression in annotation scanning introduced in 8.0.15 +A regression that caused response truncation when using forwarding + (https://issues.apache.org/bugzilla/show_bug.cgi?id=57475";>57475) has been fixed. -The RemoteAddrValve and RemoteHostValve can now optionally include the - port when filtering along with a new option to trigger authentication - rather than denying access - -Various edge cases fixes in WebSocket +Various improvements to ReplicatedMap in Tribes. - -Warning: The following notable bug was found in 8.0.17: -https://issues.apache.org/bugzilla/show_bug.cgi?id=57476";>57476: some HTTP responses may be truncated. The team works -on preparing the next release (8.0.18) to address this issue. - - Full details of these changes, and all the other changes, are available in the -Tomcat 8 changelog. +Tomcat 8 changelog. Modified: tomcat/site/trunk/docs/migration-8.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-8.html?rev=1655152&r1=1655151&r2=1655152&view=diff == --- tomcat/site/trunk/docs/migration-8.html (original) +++ tomcat/site/trunk/docs/migration-8.html Tue Jan 27 20:30:18 2015 @@ -573,7 +573,8 @@ of Apache Tomcat. "8.0.12":"1621315", "8.0.14":"1627408", "8.0.15"
svn commit: r1655152 [2/2] - in /tomcat/site/trunk: ./ docs/ xdocs/
Modified: tomcat/site/trunk/xdocs/oldnews.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews.xml?rev=1655152&r1=1655151&r2=1655152&view=diff == --- tomcat/site/trunk/xdocs/oldnews.xml (original) +++ tomcat/site/trunk/xdocs/oldnews.xml Tue Jan 27 20:30:18 2015 @@ -11,6 +11,7 @@ Announcements from previous years can be found here: + year 2014 year 2013 year 2012 year 2011 @@ -18,6 +19,34 @@ + + +The Apache Tomcat Project is proud to announce the release of version 8.0.17 +of Apache Tomcat. Apache Tomcat 8.0.17 includes numerous fixes for issues +identified in 8.0.15 as well as a number of other enhancements and changes. The +notable changes since 8.0.15 include: + + Fixing a regression in annotation scanning introduced in 8.0.15 + The RemoteAddrValve and RemoteHostValve can now optionally include the + port when filtering along with a new option to trigger authentication + rather than denying access + Various edge cases fixes in WebSocket + +Warning: The following notable bug was found in 8.0.17: +57476: some HTTP responses may be truncated. The team works +on preparing the next release (8.0.18) to address this issue. + + + +Full details of these changes, and all the other changes, are available in the +Tomcat 8 changelog. + + + +Download + + + The Apache Tomcat Project is proud to announce the release of version 8.0.15 @@ -45,539 +74,5 @@ Full details of these changes, and all t - - -The Apache Tomcat Project is proud to announce the release of version 7.0.56 of -Apache Tomcat. This release contains a number of bug fixes -and improvements compared to version 7.0.55. The notable changes -since 7.0.55 include: - - - Update the Java WebSocket support to version 1.1 of the Java WebSocket - specification. - Add support for the WebSocket permessage-deflate extension. - - -Full details of these changes, and all the other changes, are available in the -Tomcat 7 changelog. - - - -Download | -ChangeLog for 7.0.56 - - - - - -The Apache Tomcat Project is proud to announce the release of version 8.0.14 -of Apache Tomcat. Apache Tomcat 8.0.14 includes numerous fixes for issues -identified in 8.0.12 as well as a number of other enhancements and changes. The -notable changes since 8.0.12 include: - - Update the Java WebSocket support to version 1.1 of the Java WebSocket - specification. - The Windows installer, the Windows service and the Windows service - management application are all digitally signed. - Experimental support for Cookie parsing using RFC 6265. Note that the - configuration options associated with this feature are not stable and - will change in the next release. - - -Full details of these changes, and all the other changes, are available in the -Tomcat 8 changelog. - - - -Download - - - - - -The Apache Tomcat Project is proud to announce the release of version 8.0.12 -of Apache Tomcat. Apache Tomcat 8.0.12 includes numerous fixes for issues -identified in 8.0.11 as well as a number of other enhancements and changes. The -notable changes since 8.0.11 include: - - Fix a regression in the processing of includes and forwards when - Contexts had been reloaded. - Session ID generation is now extensible - Extend support for the WebSocket permessage-deflate extension to - compression of outgoing messages on the server side - - -Full details of these changes, and all the other changes, are available in the -Tomcat 8 changelog. - - - -Download - - - - - -The Apache Tomcat Project is proud to announce the release of version 8.0.11 -of Apache Tomcat. Apache Tomcat 8.0.11 includes numerous fixes for issues -identified in 8.0.9 as well as a number of other enhancements and changes. The -notable changes since 8.0.9 include: - - Update to Tomcat Native Library version 1.1.31 to pick up the Windows - binaries that are based on OpenSSL 1.0.1h. - Add support for OpenSSL syntax for ciphers when using JSSE SSL - connectors. - Add support for the WebSocket permessage-deflate extension. This is - currently limited to decompressing incoming messages on the server - side. - - -Please refer to the change log for the complete list of changes: -http://tomcat.apache.org/tomcat-8.0-doc/changelog.html - - -NOTE: A regression has been reported in 8.0.11 ( -https://issues.apache.org/bugzilla/show_bug.cgi?id=56882";>bug -56882). A 8.0.12 release is expected in the next week or so to address this. - - -Full details of these changes, and all the other changes, are available in the -Tomcat 8 changelog. - - - -Download - - - - - -The Apache Tomcat Project is proud to announce the release of version 7.0.55 of -Apache Tomcat. This release contains a number of bug fixes -and improvements compared to version 7.0.54. The notable changes -since 7.0.54 include: - - - Update to the Eclipse JDT Compiler 4.4 - Better error handling when the error occurs af
svn commit: r1655151 - in /tomcat/site/trunk/docs/tomcat-8.0-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/
Author: markt Date: Tue Jan 27 20:28:19 2015 New Revision: 1655151 URL: http://svn.apache.org/r1655151 Log: Update docs for 8.0.18 [This commit notification would consist of 1103 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57472] performance (classloader?) problems with signed jars in WEB-INF/lib
https://issues.apache.org/bugzilla/show_bug.cgi?id=57472 --- Comment #6 from Mark Thomas --- This has been fixed in trunk and 8.0.x and will be included in 8.0.19 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57472] performance (classloader?) problems with signed jars in WEB-INF/lib
https://issues.apache.org/bugzilla/show_bug.cgi?id=57472 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1655135 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/webresources/ webapps/docs/
Author: markt Date: Tue Jan 27 19:42:22 2015 New Revision: 1655135 URL: http://svn.apache.org/r1655135 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57472 Cache JarFile instances to speed up web application start, particularly with signed JARs. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceSet.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResource.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResourceSet.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 27 19:42:22 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,16
svn commit: r1655133 - in /tomcat/trunk/java/org/apache/catalina: core/ webresources/
Author: markt
Date: Tue Jan 27 19:39:42 2015
New Revision: 1655133
URL: http://svn.apache.org/r1655133
Log:
Better comments
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1655133&r1=1655132&r2=1655133&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue Jan 27
19:39:42 2015
@@ -5216,7 +5216,11 @@ public class StandardContext extends Con
broadcaster.sendNotification(notification);
}
-// Trigger clean-up of the resources
+// The WebResources implementation caches references to JAR files. On
+// some platforms these references may lock the JAR files. The
+// WebResources implementaion cleans-up unused JAR file references
every
+// run of background processing but since web application start is
+// likely to have read from lots of JARs, trigger a clean-up now.
getResources().backgroundProcess();
// Reinitializing if something went wrong
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java?rev=1655133&r1=1655132&r2=1655133&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
Tue Jan 27 19:39:42 2015
@@ -214,6 +214,12 @@ public abstract class AbstractArchiveRes
protected abstract JarInputStreamWrapper getJarInputStreamWrapper();
+/**
+ * This wrapper assumes that the InputStream was created from a JarFile
+ * obtained from a call to getArchiveResourceSet().getJarFile(). If this is
+ * not the case then the usage counting in AbstractArchiveResourceSet will
+ * break and the JarFile may be unexpectedly closed.
+ */
protected class JarInputStreamWrapper extends InputStream {
private final JarEntry jarEntry;
@@ -258,8 +264,6 @@ public abstract class AbstractArchiveRes
@Override
public void close() throws IOException {
-// Closing the JarFile releases the file lock on the JAR and also
-// closes all input streams created from the JarFile.
archiveResourceSet.closeJarFile();
}
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java?rev=1655133&r1=1655132&r2=1655133&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
Tue Jan 27 19:39:42 2015
@@ -42,7 +42,6 @@ public abstract class AbstractArchiveRes
private JarFile archive = null;
private final Object archiveLock = new Object();
private long archiveUseCount = 0;
-private long archiveLastUsed = 0;
protected final void setManifest(Manifest manifest) {
@@ -284,7 +283,6 @@ public abstract class AbstractArchiveRes
archive = new JarFile(getBase());
}
archiveUseCount++;
-archiveLastUsed = System.currentTimeMillis();
return archive;
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java?rev=1655133&r1=1655132&r2=1655133&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
Tue Jan 27 19:39:42 2015
@@ -126,8 +126,19 @@ public abstract class AbstractFileResour
}
}
+/**
+ * {@inheritDoc}
+ *
+ * This is a NO-OP by default for Fi
svn commit: r1655132 - /tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Author: markt
Date: Tue Jan 27 19:39:03 2015
New Revision: 1655132
URL: http://svn.apache.org/r1655132
Log:
Start tends to make extensive use of resources. Trigger a clean-up once
it finishes.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1655132&r1=1655131&r2=1655132&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue Jan 27
19:39:03 2015
@@ -5216,6 +5216,9 @@ public class StandardContext extends Con
broadcaster.sendNotification(notification);
}
+// Trigger clean-up of the resources
+getResources().backgroundProcess();
+
// Reinitializing if something went wrong
if (!ok) {
setState(LifecycleState.FAILED);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1655130 - /tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
Author: markt
Date: Tue Jan 27 19:38:36 2015
New Revision: 1655130
URL: http://svn.apache.org/r1655130
Log:
Skip the delay check. backgroundProcess() doesn't run that often and the
delay makes it less useful if a component wants to call it directly
(e.g. the context once start has completed)
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java?rev=1655130&r1=1655129&r2=1655130&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
Tue Jan 27 19:38:36 2015
@@ -298,8 +298,7 @@ public abstract class AbstractArchiveRes
@Override
public void backgroundProcess() {
synchronized (archiveLock) {
-if (archive != null && archiveUseCount == 0 &&
-(System.currentTimeMillis() - archiveLastUsed) > 1000) {
+if (archive != null && archiveUseCount == 0) {
try {
archive.close();
} catch (IOException e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1655129 - in /tomcat/trunk/java/org/apache/catalina/webresources: AbstractArchiveResource.java AbstractArchiveResourceSet.java JarResource.java JarWarResource.java
Author: markt
Date: Tue Jan 27 19:38:10 2015
New Revision: 1655129
URL: http://svn.apache.org/r1655129
Log:
Obtain JarFile from ArchiveResourceSet when required so useage can be
tracked and the JarFile closed when it is no longer needed.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java?rev=1655129&r1=1655128&r2=1655129&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
Tue Jan 27 19:38:10 2015
@@ -22,7 +22,6 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.security.cert.Certificate;
import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
import java.util.jar.Manifest;
public abstract class AbstractArchiveResource extends AbstractResource {
@@ -61,6 +60,10 @@ public abstract class AbstractArchiveRes
}
}
+protected AbstractArchiveResourceSet getArchiveResourceSet() {
+return archiveResourceSet;
+}
+
protected final String getBase() {
return archiveResourceSet.getBase();
}
@@ -213,13 +216,11 @@ public abstract class AbstractArchiveRes
protected class JarInputStreamWrapper extends InputStream {
-private final JarFile jarFile;
private final JarEntry jarEntry;
private final InputStream is;
-public JarInputStreamWrapper(JarFile jarFile, JarEntry jarEntry,
InputStream is) {
-this.jarFile = jarFile;
+public JarInputStreamWrapper(JarEntry jarEntry, InputStream is) {
this.jarEntry = jarEntry;
this.is = is;
}
@@ -259,7 +260,7 @@ public abstract class AbstractArchiveRes
public void close() throws IOException {
// Closing the JarFile releases the file lock on the JAR and also
// closes all input streams created from the JarFile.
-jarFile.close();
+archiveResourceSet.closeJarFile();
}
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java?rev=1655129&r1=1655128&r2=1655129&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
Tue Jan 27 19:38:10 2015
@@ -17,6 +17,7 @@
package org.apache.catalina.webresources;
import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
@@ -24,6 +25,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Set;
import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
import java.util.jar.Manifest;
import org.apache.catalina.WebResource;
@@ -37,6 +39,11 @@ public abstract class AbstractArchiveRes
private String baseUrlString;
private Manifest manifest;
+private JarFile archive = null;
+private final Object archiveLock = new Object();
+private long archiveUseCount = 0;
+private long archiveLastUsed = 0;
+
protected final void setManifest(Manifest manifest) {
this.manifest = manifest;
@@ -270,4 +277,36 @@ public abstract class AbstractArchiveRes
throw new IllegalArgumentException(
sm.getString("abstractArchiveResourceSet.setReadOnlyFalse"));
}
+
+protected JarFile openJarFile() throws IOException {
+synchronized (archiveLock) {
+if (archive == null) {
+archive = new JarFile(getBase());
+}
+archiveUseCount++;
+archiveLastUsed = System.currentTimeMillis();
+return archive;
+}
+}
+
+protected void closeJarFile() {
+synchronized (archiveLock) {
+archiveUseCount--;
+}
+}
+
+@Override
+public void backgroundProcess() {
+synchronized (archiveLock) {
+if (archive != null && archiveUseCount == 0 &&
+(System.currentTimeMillis() - archiveLastUsed) > 1000) {
+try {
+archive.close();
+} catch (IOException e) {
+// Log at least WARN
+
svn commit: r1655126 - in /tomcat/trunk/java/org/apache/catalina/webresources: AbstractArchiveResource.java AbstractArchiveResourceSet.java JarResource.java JarResourceSet.java JarWarResource.java Jar
Author: markt
Date: Tue Jan 27 19:37:03 2015
New Revision: 1655126
URL: http://svn.apache.org/r1655126
Log:
Access the Manifest directly from the archive resource set.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java
tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java?rev=1655126&r1=1655125&r2=1655126&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
Tue Jan 27 19:37:03 2015
@@ -27,10 +27,10 @@ import java.util.jar.Manifest;
public abstract class AbstractArchiveResource extends AbstractResource {
+private final AbstractArchiveResourceSet archiveResourceSet;
private final String base;
private final String baseUrl;
private final JarEntry resource;
-private final Manifest manifest;
private final String codeBaseUrl;
private final String name;
private boolean readCerts = false;
@@ -38,12 +38,12 @@ public abstract class AbstractArchiveRes
protected AbstractArchiveResource(AbstractArchiveResourceSet
archiveResourceSet,
String webAppPath, String base, String baseUrl, JarEntry jarEntry,
-Manifest manifest, String codeBaseUrl) {
+String codeBaseUrl) {
super(archiveResourceSet.getRoot(), webAppPath);
+this.archiveResourceSet = archiveResourceSet;
this.base = base;
this.baseUrl = baseUrl;
this.resource = jarEntry;
-this.manifest = manifest;
this.codeBaseUrl = codeBaseUrl;
String resourceName = resource.getName();
@@ -204,7 +204,7 @@ public abstract class AbstractArchiveRes
@Override
public Manifest getManifest() {
-return manifest;
+return archiveResourceSet.getManifest();
}
@Override
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java?rev=1655126&r1=1655125&r2=1655126&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
Tue Jan 27 19:37:03 2015
@@ -42,6 +42,10 @@ public abstract class AbstractArchiveRes
this.manifest = manifest;
}
+protected final Manifest getManifest() {
+return manifest;
+}
+
protected final void setBaseUrl(URL baseUrl) {
this.baseUrl = baseUrl;
if (baseUrl == null) {
Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java?rev=1655126&r1=1655125&r2=1655126&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java Tue Jan
27 19:37:03 2015
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
-import java.util.jar.Manifest;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -34,9 +33,9 @@ public class JarResource extends Abstrac
private static final Log log = LogFactory.getLog(JarResource.class);
public JarResource(AbstractArchiveResourceSet archiveResourceSet, String
webAppPath,
-String base, String baseUrl, JarEntry jarEntry, Manifest manifest)
{
+String base, String baseUrl, JarEntry jarEntry) {
super(archiveResourceSet, webAppPath, base, "jar:" + baseUrl, jarEntry,
-manifest, baseUrl);
+baseUrl);
}
@Override
Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java?rev=1655126&r1=1655125&r2=1655126&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/we
svn commit: r1655127 - in /tomcat/trunk/java/org/apache/catalina/webresources: AbstractArchiveResource.java JarResource.java JarResourceSet.java JarWarResource.java JarWarResourceSet.java
Author: markt
Date: Tue Jan 27 19:37:37 2015
New Revision: 1655127
URL: http://svn.apache.org/r1655127
Log:
Access base directly
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java
tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java?rev=1655127&r1=1655126&r2=1655127&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
Tue Jan 27 19:37:37 2015
@@ -28,7 +28,6 @@ import java.util.jar.Manifest;
public abstract class AbstractArchiveResource extends AbstractResource {
private final AbstractArchiveResourceSet archiveResourceSet;
-private final String base;
private final String baseUrl;
private final JarEntry resource;
private final String codeBaseUrl;
@@ -37,11 +36,9 @@ public abstract class AbstractArchiveRes
private Certificate[] certificates;
protected AbstractArchiveResource(AbstractArchiveResourceSet
archiveResourceSet,
-String webAppPath, String base, String baseUrl, JarEntry jarEntry,
-String codeBaseUrl) {
+String webAppPath, String baseUrl, JarEntry jarEntry, String
codeBaseUrl) {
super(archiveResourceSet.getRoot(), webAppPath);
this.archiveResourceSet = archiveResourceSet;
-this.base = base;
this.baseUrl = baseUrl;
this.resource = jarEntry;
this.codeBaseUrl = codeBaseUrl;
@@ -65,7 +62,7 @@ public abstract class AbstractArchiveRes
}
protected final String getBase() {
-return base;
+return archiveResourceSet.getBase();
}
protected final String getBaseUrl() {
Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java?rev=1655127&r1=1655126&r2=1655127&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java Tue Jan
27 19:37:37 2015
@@ -33,9 +33,8 @@ public class JarResource extends Abstrac
private static final Log log = LogFactory.getLog(JarResource.class);
public JarResource(AbstractArchiveResourceSet archiveResourceSet, String
webAppPath,
-String base, String baseUrl, JarEntry jarEntry) {
-super(archiveResourceSet, webAppPath, base, "jar:" + baseUrl, jarEntry,
-baseUrl);
+String baseUrl, JarEntry jarEntry) {
+super(archiveResourceSet, webAppPath, "jar:" + baseUrl, jarEntry,
baseUrl);
}
@Override
Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java?rev=1655127&r1=1655126&r2=1655127&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java Tue
Jan 27 19:37:37 2015
@@ -78,7 +78,7 @@ public class JarResourceSet extends Abst
@Override
protected WebResource createArchiveResource(JarEntry jarEntry,
String webAppPath, Manifest manifest) {
-return new JarResource(this, webAppPath, getBase(),
getBaseUrlString(), jarEntry);
+return new JarResource(this, webAppPath, getBaseUrlString(), jarEntry);
}
// Lifecycle
methods
Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java?rev=1655127&r1=1655126&r2=1655127&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java Tue
Jan 27 19:37:37 2015
@@ -36,8 +36,8 @@ public class JarWarResource extends Abst
private final String archivePath;
public JarWarResource(AbstractArchiveResourceSet archiveResourceSet,
String webAppPath,
-String base, Strin
svn commit: r1655124 - in /tomcat/trunk/java/org/apache/catalina/webresources: AbstractArchiveResource.java JarResource.java JarResourceSet.java JarWarResource.java JarWarResourceSet.java
Author: markt
Date: Tue Jan 27 19:36:26 2015
New Revision: 1655124
URL: http://svn.apache.org/r1655124
Log:
Internal path always refers to the ResourceSet so access it form their
directly.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java
tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java?rev=1655124&r1=1655123&r2=1655124&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
Tue Jan 27 19:36:26 2015
@@ -38,7 +38,7 @@ public abstract class AbstractArchiveRes
protected AbstractArchiveResource(AbstractArchiveResourceSet
archiveResourceSet,
String webAppPath, String base, String baseUrl, JarEntry jarEntry,
-String internalPath, Manifest manifest, String codeBaseUrl) {
+Manifest manifest, String codeBaseUrl) {
super(archiveResourceSet.getRoot(), webAppPath);
this.base = base;
this.baseUrl = baseUrl;
@@ -50,6 +50,7 @@ public abstract class AbstractArchiveRes
if (resourceName.charAt(resourceName.length() - 1) == '/') {
resourceName = resourceName.substring(0, resourceName.length() -
1);
}
+String internalPath = archiveResourceSet.getInternalPath();
if (internalPath.length() > 0 && resourceName.equals(
internalPath.subSequence(1, internalPath.length( {
name = "";
Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java?rev=1655124&r1=1655123&r2=1655124&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java Tue Jan
27 19:36:26 2015
@@ -34,9 +34,8 @@ public class JarResource extends Abstrac
private static final Log log = LogFactory.getLog(JarResource.class);
public JarResource(AbstractArchiveResourceSet archiveResourceSet, String
webAppPath,
-String base, String baseUrl, JarEntry jarEntry, String
internalPath,
-Manifest manifest) {
-super(archiveResourceSet, webAppPath, base, "jar:" + baseUrl,
jarEntry, internalPath,
+String base, String baseUrl, JarEntry jarEntry, Manifest manifest)
{
+super(archiveResourceSet, webAppPath, base, "jar:" + baseUrl, jarEntry,
manifest, baseUrl);
}
Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java?rev=1655124&r1=1655123&r2=1655124&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java Tue
Jan 27 19:36:26 2015
@@ -79,7 +79,7 @@ public class JarResourceSet extends Abst
protected WebResource createArchiveResource(JarEntry jarEntry,
String webAppPath, Manifest manifest) {
return new JarResource(this, webAppPath, getBase(), getBaseUrlString(),
-jarEntry, getInternalPath(), manifest);
+jarEntry, manifest);
}
// Lifecycle
methods
Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java?rev=1655124&r1=1655123&r2=1655124&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java Tue
Jan 27 19:36:26 2015
@@ -37,10 +37,9 @@ public class JarWarResource extends Abst
private final String archivePath;
public JarWarResource(AbstractArchiveResourceSet archiveResourceSet,
String webAppPath,
-String base, String baseUrl, JarEntry jarEntry, String archivePath,
-String internalPath, Manifest manifest) {
+String base, String bas
svn commit: r1655123 - in /tomcat/trunk/java/org/apache/catalina/webresources: AbstractArchiveResource.java JarResource.java JarResourceSet.java JarWarResource.java JarWarResourceSet.java
Author: markt
Date: Tue Jan 27 19:35:52 2015
New Revision: 1655123
URL: http://svn.apache.org/r1655123
Log:
Expose the AbstractArchiveResourceSet to archive resources.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java
tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java?rev=1655123&r1=1655122&r2=1655123&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
Tue Jan 27 19:35:52 2015
@@ -25,8 +25,6 @@ import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
-import org.apache.catalina.WebResourceRoot;
-
public abstract class AbstractArchiveResource extends AbstractResource {
private final String base;
@@ -38,10 +36,10 @@ public abstract class AbstractArchiveRes
private boolean readCerts = false;
private Certificate[] certificates;
-protected AbstractArchiveResource(WebResourceRoot root, String webAppPath,
-String base, String baseUrl, JarEntry jarEntry,
+protected AbstractArchiveResource(AbstractArchiveResourceSet
archiveResourceSet,
+String webAppPath, String base, String baseUrl, JarEntry jarEntry,
String internalPath, Manifest manifest, String codeBaseUrl) {
-super(root, webAppPath);
+super(archiveResourceSet.getRoot(), webAppPath);
this.base = base;
this.baseUrl = baseUrl;
this.resource = jarEntry;
Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java?rev=1655123&r1=1655122&r2=1655123&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java Tue Jan
27 19:35:52 2015
@@ -22,7 +22,6 @@ import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
-import org.apache.catalina.WebResourceRoot;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -34,10 +33,10 @@ public class JarResource extends Abstrac
private static final Log log = LogFactory.getLog(JarResource.class);
-public JarResource(WebResourceRoot root, String webAppPath, String base,
-String baseUrl, JarEntry jarEntry, String internalPath,
+public JarResource(AbstractArchiveResourceSet archiveResourceSet, String
webAppPath,
+String base, String baseUrl, JarEntry jarEntry, String
internalPath,
Manifest manifest) {
-super(root, webAppPath, base, "jar:" + baseUrl, jarEntry, internalPath,
+super(archiveResourceSet, webAppPath, base, "jar:" + baseUrl,
jarEntry, internalPath,
manifest, baseUrl);
}
Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java?rev=1655123&r1=1655122&r2=1655123&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java Tue
Jan 27 19:35:52 2015
@@ -78,7 +78,7 @@ public class JarResourceSet extends Abst
@Override
protected WebResource createArchiveResource(JarEntry jarEntry,
String webAppPath, Manifest manifest) {
-return new JarResource(getRoot(), webAppPath, getBase(),
getBaseUrlString(),
+return new JarResource(this, webAppPath, getBase(), getBaseUrlString(),
jarEntry, getInternalPath(), manifest);
}
Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java?rev=1655123&r1=1655122&r2=1655123&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java Tue
Jan 27 19:35:52 2015
@@ -23,7 +23,6 @@ import java.util.jar.J
svn commit: r1655122 - in /tomcat/trunk/java/org/apache/catalina: WebResourceSet.java webresources/AbstractResourceSet.java webresources/EmptyResourceSet.java webresources/StandardRoot.java
Author: markt
Date: Tue Jan 27 19:35:17 2015
New Revision: 1655122
URL: http://svn.apache.org/r1655122
Log:
Add background processing to WebResourceSets (currently a NO-OP)
Modified:
tomcat/trunk/java/org/apache/catalina/WebResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
Modified: tomcat/trunk/java/org/apache/catalina/WebResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/WebResourceSet.java?rev=1655122&r1=1655121&r2=1655122&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/WebResourceSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/WebResourceSet.java Tue Jan 27
19:35:17 2015
@@ -147,4 +147,10 @@ public interface WebResourceSet extends
* read-only, otherwise false
*/
boolean isReadOnly();
+
+/**
+ * Hook to allow the WebResourceRoot to trigger regular tasks on this set
of
+ * resources.
+ */
+void backgroundProcess();
}
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java?rev=1655122&r1=1655121&r2=1655122&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
Tue Jan 27 19:35:17 2015
@@ -111,6 +111,12 @@ public abstract class AbstractResourceSe
this.staticOnly = staticOnly;
}
+@Override
+public void backgroundProcess() {
+// NO-OP
+}
+
+
// Lifecycle
methods
@Override
protected final void startInternal() throws LifecycleException {
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java?rev=1655122&r1=1655121&r2=1655122&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java
Tue Jan 27 19:35:17 2015
@@ -152,6 +152,13 @@ public class EmptyResourceSet extends Li
return true;
}
+
+@Override
+public void backgroundProcess() {
+// NO-OP
+}
+
+
@Override
protected void initInternal() throws LifecycleException {
// NO-OP
Modified: tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1655122&r1=1655121&r2=1655122&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java Tue
Jan 27 19:35:17 2015
@@ -591,9 +591,15 @@ public class StandardRoot extends Lifecy
mainResources.add(main);
}
+
@Override
public void backgroundProcess() {
cache.backgroundProcess();
+for (List list : allResources) {
+for (WebResourceSet webResourceSet : list) {
+webResourceSet.backgroundProcess();
+}
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1655120 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/authenticator/DigestAuthenticator.java webapps/docs/changelog.xml
Author: fschumacher
Date: Tue Jan 27 19:30:52 2015
New Revision: 1655120
URL: http://svn.apache.org/r1655120
Log:
Remove volatile from variables, as it is misleading. All
variables, that are mutable and read/written from different threads are only
modified/read within a synchronized block. All other variables are immutable
and are now declared final. Issue identified by Coverity Scan.
Merge r1654851 from /tomcat/trunk
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 27 19:30:52 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654852,1654978
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=1655120&r1=1655119&r2=1655120&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
Tue Jan 27 19:30:52 2015
@@ -637,10 +637,10 @@ public class DigestAuthenticator extends
}
private static class NonceInfo {
-private volatile long timestamp;
-private volatile boolean seen[];
-private volatile int offset;
-
svn commit: r1655117 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/servlets/ java/org/apache/tomcat/util/net/jsse/ java/org/apache/tomcat/util/net/jsse/res/
Author: fschumacher
Date: Tue Jan 27 19:25:40 2015
New Revision: 1655117
URL: http://svn.apache.org/r1655117
Log:
Log failure to close a resource instead of ignoring it silently.
Merged r1654852,1654978 from /tomcat/trunk
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 27 19:25:40 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654852,1654978
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1655117&r1=1655116&r2=1655117&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Tue
Jan 27 19:25:40 2015
@@ -1136,7 +1136,8 @@ public final class CGIServlet extends Ht
if (f.exists()) {
try {
is.close();
-} catch (IOException ignore) {
+} catch (IOException e) {
+log("Could not close is", e);
}
svn commit: r1655115 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/servlets/CGIServlet.java
Author: fschumacher
Date: Tue Jan 27 19:22:38 2015
New Revision: 1655115
URL: http://svn.apache.org/r1655115
Log:
Close input and output streams in expandCGIScript to
avoid resource leaks. Issue reported by Coverity Scan.
Merged r1654524 from /tomcat/trunk
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 27 19:22:38 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654725,1654735,1654766,1654785
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1655115&r1=1655114&r2=1655115&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Tue
Jan 27 19:22:38 2015
@@ -1134,6 +1134,10 @@ public final class CGIServlet extends Ht
File f = new File(destPath.toString());
if (f.exists()) {
+try {
+is.close();
+} catch (IOException ignore) {
+}
// Don't need to expand if it already exists
return;
}
@@ -1163,10 +1167,16 @@ public final class CGIServlet extends Ht
}
FileOutputStream fos = new FileOutputStream(f);
-// copy data
-
svn commit: r1655114 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/servlets/DefaultServlet.java
Author: fschumacher
Date: Tue Jan 27 19:21:25 2015
New Revision: 1655114
URL: http://svn.apache.org/r1655114
Log:
Close the inputstream that was used to get the content of
the readme file. Issue reported by Coverity Scan.
Merged r1654522 from /tomcat/trunk
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 27 19:21:25 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654725,1654735,1654766,1654785
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654725,1654735,1654766,1654785
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1655114&r1=1655113&r2=1655114&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Tue Jan 27 19:21:25 2015
@@ -1538,9 +1538,11 @@ public class DefaultServlet extends Http
directory.getWebappPath() + readmeFile);
if (resource.isFile()) {
StringWriter buffer = new StringWriter();
-InputStream is = resource.getInputStream();
-copyRange(new InputStreamReader(is),
-new PrintWriter(buffer));
+try (InputStream is = resource.getInputStream();
+InputStreamReader reader = new InputStreamReader(is)) {
+copyRange(r
svn commit: r1655112 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Author: fschumacher
Date: Tue Jan 27 19:19:57 2015
New Revision: 1655112
URL: http://svn.apache.org/r1655112
Log:
Close the socket that was used to determine the ssl
capabilities. Issue reported by Coverity Scan.
Merged r1654517 from /tomcat/trunk.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 27 19:19:57 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654725,1654735,1654766,1654785
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654725,1654735,1654766,1654785
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1655112&r1=1655111&r2=1655112&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Tue Jan 27 19:19:57 2015
@@ -166,24 +166,36 @@ public class JSSESocketFactory implement
return;
}
-defaultServerCipherSuites = socket.getEnabledCipherSuites();
-if (defaultServerCipherSuites.length == 0) {
-log.warn(sm.getString("jsse.noDefaultCiphers",
endpoint.getName()));
-}
+try {
+defaultServerCipherSuites = socket.getEnabledCipherSuites();
+if (defaultServerCipherSuites.length == 0) {
+log.warn(sm.getString("jsse.noDefaultCiphers",
+endpoint
svn commit: r1655109 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/changelog.xml webapps/examples/WEB-INF/classes/examples/ShowSource.java
Author: fschumacher Date: Tue Jan 27 19:17:02 2015 New Revision: 1655109 URL: http://svn.apache.org/r1655109 Log: Close input stream for including jsp. Issue reported by Coverity Scan. Merged r1654515 from /tomcat/trunk Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml tomcat/tc8.0.x/trunk/webapps/examples/WEB-INF/classes/examples/ShowSource.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 27 19:17:02 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654725,1654735,1654766,1654785 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654725,1654735,1654766,1654785 Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1655109&r1=1655108&r2=1655109&view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Jan 27 19:17:02 2015 @@ -64,6 +64,10 @@ Clarify documentation for useBodyEncodingForURI attribute of a connector. (kkolinko) + +Fix possible resource leaks by closing streams properly. Issues +reported by Coverity Scan. (fschumacher) + Modified: tomcat/tc8.0.x/trunk/webapps/examples/WEB-INF/classes/examples/ShowSource.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/examples/WEB-INF/classes/examples/ShowSource.java?rev=1655109&r1=1655108&r2=1655109&view=diff == --- tomcat/tc8.0.x/trunk/webapps/examples/WEB-INF/classes/examples/ShowSource.j
svn commit: r7842 - in /dev/tomcat/taglibs/taglibs-standard-1.2.2: ./ taglibs-standard-1.2.2-source-release.zip taglibs-standard-1.2.2-source-release.zip.asc
Author: jboynes Date: Mon Jan 26 17:12:02 2015 New Revision: 7842 Log: Add taglibs-standard-1.2.2 for voting Added: dev/tomcat/taglibs/taglibs-standard-1.2.2/ dev/tomcat/taglibs/taglibs-standard-1.2.2/taglibs-standard-1.2.2-source-release.zip (with props) dev/tomcat/taglibs/taglibs-standard-1.2.2/taglibs-standard-1.2.2-source-release.zip.asc Added: dev/tomcat/taglibs/taglibs-standard-1.2.2/taglibs-standard-1.2.2-source-release.zip == Binary file - no diff available. Propchange: dev/tomcat/taglibs/taglibs-standard-1.2.2/taglibs-standard-1.2.2-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/taglibs/taglibs-standard-1.2.2/taglibs-standard-1.2.2-source-release.zip.asc == --- dev/tomcat/taglibs/taglibs-standard-1.2.2/taglibs-standard-1.2.2-source-release.zip.asc (added) +++ dev/tomcat/taglibs/taglibs-standard-1.2.2/taglibs-standard-1.2.2-source-release.zip.asc Mon Jan 26 17:12:02 2015 @@ -0,0 +1,12 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG/MacGPG2 v2 +Comment: GPGTools - https://gpgtools.org + +iQEcBAABCgAGBQJUxnIgAAoJEKVK0I6noCM8NZYH/R18HyWj9xVHosQb6B2UI9RP +kHoIXTNCevaqCaIgm+0o3NKSU+amtAdaFCSy4FyDGUXYo3Sa1bXxi7GlLGAGbxfP +e5wyrE30mgAQRAHcyXxFk5phsWQIr20dec9rZoXhXH1cJSL3q4qvPuoMOUmmKZRC +VDilx9ogboYDCcfhko7kVFkDMDqCQlfp4l0EEv8tXaC6gh5/qbwaEYx358g4aT/T +yj+KEPSFX6zZiC9HBBDe91pjmVEFSbEfyIzLwHxWMB5keI3AiHnKPRzc30tw8QFC +KRHJaC1toaOeCc9cgsu4HpFjiRPD81SCrgQ+krrcTD/vUt+rajwkYc4YWMTC/4I= +=RjH0 +-END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1655108 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/scan/JarFileUrlNestedJar.java webapps/docs/changelog.xml
Author: fschumacher
Date: Tue Jan 27 19:11:43 2015
New Revision: 1655108
URL: http://svn.apache.org/r1655108
Log:
Assign newly created stream to field instead of leaking it
uselessly. Issue reported by Coverity Scan.
Merged r1654513 from /tomcat/trunk.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/JarFileUrlNestedJar.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 27 19:11:43 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654725,1654735,1654766,1654785
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654725,1654735,1654766,1654785
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/JarFileUrlNestedJar.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/JarFileUrlNestedJar.java?rev=1655108&r1=1655107&r2=1655108&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/JarFileUrlNestedJar.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/JarFileUrlNestedJar.java
Tue Jan 27 19:11:43 2015
@@ -178,7 +178,7 @@ public class JarFileUrlNestedJar impleme
@Override
public InputStream getEntryInputStream() throws IOException {
if (jarInputStream == null) {
-createJarInputStream();
+jarInputStream = createJarInputStream();
}
return jarInputStream;
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1655108&r1=1655107&r2=1655108&view=diff
[Bug 57505] New: Add integration tests for JspC
https://issues.apache.org/bugzilla/show_bug.cgi?id=57505 Bug ID: 57505 Summary: Add integration tests for JspC Product: Tomcat 9 Version: unspecified Hardware: All OS: All Status: NEW Severity: enhancement Priority: P2 Component: Jasper Assignee: dev@tomcat.apache.org Reporter: jboy...@apache.org The test suite should run JspC over webapps to verify the standalone translation behaviour (outside the container). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.58
On Jan 26, 2015, at 6:54 AM, Violeta Georgieva wrote: > > The proposed Apache Tomcat 7.0.58 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.58/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1031/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_58/ > > The proposed 7.0.58 release is: > [X] Broken - do not release > [ ] Stable - go ahead and release as 7.0.58 Stable https://issues.apache.org/bugzilla/show_bug.cgi?id=57504 breaks JspC with webapps that use tags signature.asc Description: Message signed with OpenPGP using GPGMail
[Bug 57504] Jasper task (JspC) throws NPE on taglibs in 7.0.58
https://issues.apache.org/bugzilla/show_bug.cgi?id=57504 Jeremy Boynes changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #2 from Jeremy Boynes --- Patch applied in http://svn.apache.org/viewvc?view=revision&revision=1655089 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1655089 - /tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java
Author: jboynes Date: Tue Jan 27 16:47:56 2015 New Revision: 1655089 URL: http://svn.apache.org/r1655089 Log: Fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=57504 Initialize tldLocationsCache when creating the ServletContext Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java?rev=1655089&r1=1655088&r2=1655089&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java Tue Jan 27 16:47:56 2015 @@ -1467,6 +1467,7 @@ public class JspC extends Task implement context.setInitParameter(Constants.XML_BLOCK_EXTERNAL_INIT_PARAM, String.valueOf(isBlockExternal())); +tldLocationsCache = TldLocationsCache.getInstance(context); rctxt = new JspRuntimeContext(context, this); jspConfig = new JspConfig(context); tagPluginManager = new TagPluginManager(context); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57504] Jasper task (JspC) throws NPE on taglibs in 7.0.58
https://issues.apache.org/bugzilla/show_bug.cgi?id=57504 --- Comment #1 from Jeremy Boynes --- Created attachment 32401 --> https://issues.apache.org/bugzilla/attachment.cgi?id=32401&action=edit Patch to initialize tldLocationsCache I have verified this using tc7.0.x branch. The attached patch prevents this error but I've not fully investigated the consequences. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Taglibs 1.2.2
> On Jan 27, 2015, at 7:59 AM, Konstantin Kolinko > wrote: > > 2015-01-26 20:17 GMT+03:00 Jeremy Boynes : >> The proposed Apache Taglibs 1.2.2 release is now available for voting. >> >> It can be obtained from: >> >> https://dist.apache.org/repos/dist/dev/tomcat/taglibs/taglibs-standard-1.2.2/ >> >> The Maven staging repo is: >> https://repository.apache.org/content/repositories/orgapachetomcat-1032/ >> >> The SVN tag is: >> >> http://svn.apache.org/repos/asf/tomcat/taglibs/standard/tags/taglibs-standard-1.2.2/ >> >> The proposed 1.2.2 release is: >> [ ] Broken - do not release >> [ ] Stable - go ahead and release as 1.2.2 Stable > > The directory at dist.apache.org contains only 2 files, > taglibs-standard-1.2.2-source-release.zip > taglibs-standard-1.2.2-source-release.zip.asc > > I went on and added NOTICE, READMEs and checksums there. > I plan to add the other files from Maven, like it was done for 1.2.1 here: > https://dist.apache.org/repos/dist/release/tomcat/taglibs/taglibs-standard-1.2.1/ > > But here is a question the taglibs-standard-1.2.2-source-release.zip > on dist.a.o differs from one in Maven at > https://repository.apache.org/content/repositories/orgapachetomcat-1032/org/apache/taglibs/taglibs-standard/1.2.2/ > > The only difference is timestamps. The contents of the files in the > archives is the same, but in the Maven staing repository zip all files > have the same timestamp, while in the dist.a.o zip the timestamps for > files in the archive are different. > > I think that it would be better to replace the zip file on dist.a.o > with the one from Maven. Any objections or concerns here? +1 Thanks for catching that. Jeremy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57251] WAR deployment unbelievably slow when unpackWARs=false
https://issues.apache.org/bugzilla/show_bug.cgi?id=57251 --- Comment #9 from Mark Thomas --- The fix for bug 57472 might shave a few seconds of the deployment time but it doesn't appear to make a significant difference. The fundamental problem when running from a packed WAR is that to access any resource in a JAR, Tomcat has to do the following: - open the WAR - get the entry for the JAR - get the InputStream for the JAR entry - Create a JarInputStream - Read the JarInputStream until it finds the entry it wants This is always going to be slow. The reason that it is fast in Tomcat 7 and earlier took some digging. In unpackWARs is false in Tomcat 7, it unpacks the JARs anyway into the work directory and uses them from there. Performance is therefore comparable with unpackWARs="true". I haven't made my mind up what is the right thing to do here. On one hand, unpackWARS="false" really should mean exactly that. Not "don't unpack the WAR into the appBase but so unpack the JARs in to the work dir". You might as well just use unpackWARs="true". On the other hand, the performance is clearly worse. It was a factor of 3 on my machine but clearly it varies from machine to machine. It looks to be in the range 3 to 10 times slower - which is not good. To throw something else into the mix, static resources will be cached in memory in both cases for improved performance. As I ponder what to do about this I do have one question. Why do you want to run with unpackWARs="false"? What is the use case? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Taglibs 1.2.2
2015-01-26 20:17 GMT+03:00 Jeremy Boynes : > The proposed Apache Taglibs 1.2.2 release is now available for voting. > > It can be obtained from: > > https://dist.apache.org/repos/dist/dev/tomcat/taglibs/taglibs-standard-1.2.2/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1032/ > > The SVN tag is: > > http://svn.apache.org/repos/asf/tomcat/taglibs/standard/tags/taglibs-standard-1.2.2/ > > The proposed 1.2.2 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 1.2.2 Stable The directory at dist.apache.org contains only 2 files, taglibs-standard-1.2.2-source-release.zip taglibs-standard-1.2.2-source-release.zip.asc I went on and added NOTICE, READMEs and checksums there. I plan to add the other files from Maven, like it was done for 1.2.1 here: https://dist.apache.org/repos/dist/release/tomcat/taglibs/taglibs-standard-1.2.1/ But here is a question the taglibs-standard-1.2.2-source-release.zip on dist.a.o differs from one in Maven at https://repository.apache.org/content/repositories/orgapachetomcat-1032/org/apache/taglibs/taglibs-standard/1.2.2/ The only difference is timestamps. The contents of the files in the archives is the same, but in the Maven staing repository zip all files have the same timestamp, while in the dist.a.o zip the timestamps for files in the archive are different. I think that it would be better to replace the zip file on dist.a.o with the one from Maven. Any objections or concerns here? Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57504] New: Jasper task (JspC) throws NPE on taglibs in 7.0.58
https://issues.apache.org/bugzilla/show_bug.cgi?id=57504 Bug ID: 57504 Summary: Jasper task (JspC) throws NPE on taglibs in 7.0.58 Product: Tomcat 7 Version: trunk Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Jasper Assignee: dev@tomcat.apache.org Reporter: mster...@gmail.com Created attachment 32400 --> https://issues.apache.org/bugzilla/attachment.cgi?id=32400&action=edit Repeat build.xml It seems like revision 1645615 broke the ant jasper task in 7.0.58 for taglibs. Repeat: 1) Download and unzip apache-tomcat-7.0.58.zip and apache-ant-1.9.4-bin.zip to a temporary directory. 2) Put the following into a new file build.xml in the directory: (attached, based on http://tomcat.apache.org/tomcat-7.0-doc/jasper-howto.html#Web_Application_Compilation) 3) Execute "apache-ant-1.9.4/bin/ant jspc" in the directory. Expected result: Compiled output in tmp/WEB-INF Actual result: Exception is thrown and only partial output to tmp/WEB-INF: jspc: [jasper] java.lang.NullPointerException [jasper] at org.apache.jasper.JspCompilationContext.getTldLocation(JspCompilationContext.java:618) [jasper] at org.apache.jasper.compiler.Parser.parseTaglibDirective(Parser.java:409) [jasper] at org.apache.jasper.compiler.Parser.parseDirective(Parser.java:475) [jasper] at org.apache.jasper.compiler.Parser.parseElements(Parser.java:1410) [jasper] at org.apache.jasper.compiler.Parser.parse(Parser.java:138) [jasper] at org.apache.jasper.compiler.ParserController.doParse(ParserController.java:242) [jasper] at org.apache.jasper.compiler.ParserController.parse(ParserController.java:102) [jasper] at org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:199) [jasper] at org.apache.jasper.compiler.Compiler.compile(Compiler.java:374) [jasper] at org.apache.jasper.JspC.processFile(JspC.java:1213) [jasper] at org.apache.jasper.JspC.execute(JspC.java:1364) [jasper] at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292) [jasper] at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [jasper] at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) [jasper] at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) [jasper] at java.lang.reflect.Method.invoke(Method.java:606) [jasper] at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:106) [jasper] at org.apache.tools.ant.Task.perform(Task.java:348) [jasper] at org.apache.tools.ant.Target.execute(Target.java:435) [jasper] at org.apache.tools.ant.Target.performTasks(Target.java:456) [jasper] at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1393) [jasper] at org.apache.tools.ant.Project.executeTarget(Project.java:1364) [jasper] at org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExecutor.java:41) [jasper] at org.apache.tools.ant.Project.executeTargets(Project.java:1248) [jasper] at org.apache.tools.ant.Main.runBuild(Main.java:851) [jasper] at org.apache.tools.ant.Main.startAnt(Main.java:235) [jasper] at org.apache.tools.ant.launch.Launcher.run(Launcher.java:280) [jasper] at org.apache.tools.ant.launch.Launcher.main(Launcher.java:109) If 7.0.58 is replaced by 7.0.57 then the repeat runs without any exception and with complete output. The problem seems to be the cleanup of the tldLocationsCache initialization in revision 1645615, partially backported from revision 1541041, since it's still used by JspCompilationContext.getTldLocation. Possibly the fix is as easy as bringing back the initialization line. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: regression in 8.0.18?
Ok I think I identified the issue but it is weird as well: seems I had (thanks maven for it) tomcat 8.0.18 + tomcat-el-api in version 8.0.12. So the bug was in the 8.0.12 actually. What is weird is it appeared only when upgrading to 8.0.18 other artifacts. Romain Manni-Bucau @rmannibucau http://www.tomitribe.com http://rmannibucau.wordpress.com https://github.com/rmannibucau 2015-01-27 13:52 GMT+01:00 Konstantin Kolinko : > 2015-01-27 15:18 GMT+03:00 Konstantin Kolinko : >> 2015-01-26 21:17 GMT+03:00 Romain Manni-Bucau : >>> Hi guys, >>> >>> since I upgraded to 8.0.18 I get: >>> >>> SEVERE: Servlet.service() for servlet [jsp] in context with path >>> [/test] threw exception [javax.el.ELException: The class >>> [java.util.Iterator] must be public, non-abstract and not an >>> interface] with root cause >>> javax.el.ELException: The class [java.util.Iterator] must be public, >>> non-abstract and not an interface >>> at javax.el.ImportHandler.findClass(ImportHandler.java:171) >>> at javax.el.ImportHandler.importClass(ImportHandler.java:111) >> >> 1. Your stacktrace (the above lines) does not match the source code of >> current Tomcat 8.0.x and thus of 8.0.18. >> >>> at >>> org.apache.jasper.runtime.PageContextImpl.getELContext(PageContextImpl.java:954) >>> at org.apache.jsp.setup_jsp._jspx_meth_c_005fset_005f0(setup_jsp.java:261) >>> at org.apache.jsp.setup_jsp._jspService(setup_jsp.java:136) >>> at org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:70) >>> at javax.servlet.http.HttpServlet.service(HttpServlet.java:725) >>> at >>> org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:431) >>> at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:396) >>> at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:340) >>> at javax.servlet.http.HttpServlet.service(HttpServlet.java:725) >>> > > To clarify: > In the current Tomcat 8 calling ImportHandler.importClass() does not > perform any validation > (except a satiny check that the name contains a '.'). > > That was thanks to early testing, as well as based on performance > concerns. It has been discussed in > https://issues.apache.org/bugzilla/show_bug.cgi?id=57142#c11 > > The check is performed when the class is resolved in > ImportHandler.resolveClass() and > only if you explicitly call that class name. > > I think that an unexpected collision between imported class names and > EL expressions is unlikely. > > Best regards, > Konstantin Kolinko > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: regression in 8.0.18?
2015-01-27 15:18 GMT+03:00 Konstantin Kolinko : > 2015-01-26 21:17 GMT+03:00 Romain Manni-Bucau : >> Hi guys, >> >> since I upgraded to 8.0.18 I get: >> >> SEVERE: Servlet.service() for servlet [jsp] in context with path >> [/test] threw exception [javax.el.ELException: The class >> [java.util.Iterator] must be public, non-abstract and not an >> interface] with root cause >> javax.el.ELException: The class [java.util.Iterator] must be public, >> non-abstract and not an interface >> at javax.el.ImportHandler.findClass(ImportHandler.java:171) >> at javax.el.ImportHandler.importClass(ImportHandler.java:111) > > 1. Your stacktrace (the above lines) does not match the source code of > current Tomcat 8.0.x and thus of 8.0.18. > >> at >> org.apache.jasper.runtime.PageContextImpl.getELContext(PageContextImpl.java:954) >> at org.apache.jsp.setup_jsp._jspx_meth_c_005fset_005f0(setup_jsp.java:261) >> at org.apache.jsp.setup_jsp._jspService(setup_jsp.java:136) >> at org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:70) >> at javax.servlet.http.HttpServlet.service(HttpServlet.java:725) >> at >> org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:431) >> at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:396) >> at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:340) >> at javax.servlet.http.HttpServlet.service(HttpServlet.java:725) >> To clarify: In the current Tomcat 8 calling ImportHandler.importClass() does not perform any validation (except a satiny check that the name contains a '.'). That was thanks to early testing, as well as based on performance concerns. It has been discussed in https://issues.apache.org/bugzilla/show_bug.cgi?id=57142#c11 The check is performed when the class is resolved in ImportHandler.resolveClass() and only if you explicitly call that class name. I think that an unexpected collision between imported class names and EL expressions is unlikely. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: regression in 8.0.18?
2015-01-26 21:17 GMT+03:00 Romain Manni-Bucau : > Hi guys, > > since I upgraded to 8.0.18 I get: > > SEVERE: Servlet.service() for servlet [jsp] in context with path > [/test] threw exception [javax.el.ELException: The class > [java.util.Iterator] must be public, non-abstract and not an > interface] with root cause > javax.el.ELException: The class [java.util.Iterator] must be public, > non-abstract and not an interface > at javax.el.ImportHandler.findClass(ImportHandler.java:171) > at javax.el.ImportHandler.importClass(ImportHandler.java:111) 1. Your stacktrace (the above lines) does not match the source code of current Tomcat 8.0.x and thus of 8.0.18. 2. Reproduction recipe is needed. I cannot reproduce the issue with a simple example of importing and using an Iterator. If it is reproducible, it needs a ticket in Bugzilla. 3. By the way: On a reflection, I wonder why ImportHandler.resolveClass(), resolveStatic() methods have to reject classes that are abstract or interfaces. My points: 1) An interface and an abstract class both can declare constants (static fields) 2) An abstract class can declare static methods. http://docs.oracle.com/javaee/7/api/javax/el/ImportHandler.html > at > org.apache.jasper.runtime.PageContextImpl.getELContext(PageContextImpl.java:954) > at org.apache.jsp.setup_jsp._jspx_meth_c_005fset_005f0(setup_jsp.java:261) > at org.apache.jsp.setup_jsp._jspService(setup_jsp.java:136) > at org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:70) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:725) > at > org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:431) > at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:396) > at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:340) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:725) > > with > http://svn.apache.org/repos/asf/tomee/tomee/trunk/examples/moviefun/src/main/webapp/setup.jsp > (this line: for (Iterator iterator = movies.iterator(); > iterator.hasNext(); )) > > Is it expected? not sure I get why interfaces are forbidden in > particular with <%@ page import="java.util.Iterator" %> > > I saw indirectly https://java.net/jira/browse/JSP-44 but this is not > the cause, any pointer? The feature request mentioned there: https://issues.apache.org/bugzilla/show_bug.cgi?id=57142 > > will a flag be introduced for existing apps? Nobody has requested such a feature. 1. Is there a valid use case? 2. Detailed requirements = ? Explicit imports are controlled by Jasper generating the code, but what about implicit imports (java.lang.*, javax.servlet.* etc.) - are they affected or not? 2015-01-26 22:46 GMT+03:00 Mark Thomas : > > That code hasn't changed 8.0.17 -> 8.0.18 (I don't think) but it did > change in a previous version. > Violletta fixed an issue there - the classes imports were not processed http://svn.apache.org/viewvc?view=revision&revision=r1653830 Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57251] WAR deployment unbelievably slow when unpackWARs=false
https://issues.apache.org/bugzilla/show_bug.cgi?id=57251 --- Comment #8 from Mark Thomas --- Thanks for the test case. I'm currently working on a potentially related issue (BZ 57472) so I'll look at this once I have fixed that. I suspect similar root causes - performance issues in the new (in 8.0.x) resources implementation when accessing resources in archives. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "ContributorsGroup" by markt
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "ContributorsGroup" page has been changed by markt: https://wiki.apache.org/tomcat/ContributorsGroup?action=diff&rev1=24&rev2=25 * SiegfriedGoeschl * OgnjenBlagojevic * CoreyNorthcutt + * ArKam - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.58
2015-01-26 15:54 GMT+01:00 Violeta Georgieva : > The proposed Apache Tomcat 7.0.58 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.58/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1031/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_58/ > > The proposed 7.0.58 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 7.0.58 Stable > > +1 Rémy
