DO NOT REPLY [Bug 50169] New: Trying to register wrapper and welcomeFile to Mapper before context is registered on Mapper.
https://issues.apache.org/bugzilla/show_bug.cgi?id=50169 Summary: Trying to register wrapper and welcomeFile to Mapper before context is registered on Mapper. Product: Tomcat 7 Version: trunk Platform: All OS/Version: All Status: NEW Severity: minor Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: mashm...@gmail.com Created an attachment (id=26220) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26220) patch for StandardContext and StandardWrapper When I used "Host start operation" via JMX, I got error messages. 2010/10/28 11:04:10 org.apache.tomcat.util.http.mapper.Mapper addWrapper SEVERE: No context found: 2010/10/28 11:04:10 org.apache.tomcat.util.http.mapper.Mapper addWrapper SEVERE: No context found: 2010/10/28 11:04:10 org.apache.tomcat.util.http.mapper.Mapper addWrapper SEVERE: No context found: 2010/10/28 11:04:10 org.apache.tomcat.util.http.mapper.Mapper addWrapper SEVERE: No context found: 2010/10/28 11:04:10 org.apache.tomcat.util.http.mapper.Mapper addWrapper SEVERE: No context found: 2010/10/28 11:04:10 org.apache.tomcat.util.http.mapper.Mapper addWrapper SEVERE: No context found: 2010/10/28 11:04:10 org.apache.tomcat.util.http.mapper.Mapper addWelcomeFile SEVERE: No context found: 2010/10/28 11:04:10 org.apache.tomcat.util.http.mapper.Mapper addWelcomeFile SEVERE: No context found: 2010/10/28 11:04:10 org.apache.tomcat.util.http.mapper.Mapper addWelcomeFile SEVERE: No context found: 2010/10/28 11:04:10 org.apache.tomcat.util.http.mapper.Mapper addWelcomeFile SEVERE: No context found: 2010/10/28 11:04:10 org.apache.tomcat.util.http.mapper.Mapper addWelcomeFile SEVERE: No context found: 2010/10/28 11:04:10 org.apache.tomcat.util.http.mapper.Mapper addWelcomeFile SEVERE: No context found: At first StandardHost starts /manager context. (1) LifecycleState is STARTING_PREP now. Wrapper is not registered because host has not been registered. Mapper.addWrapper(String, String, String, Object, boolean) line: 331 MapperListener.containerEvent(ContainerEvent) line: 169 StandardWrapper(ContainerBase).fireContainerEvent(String, Object) line: 1253 StandardWrapper.addMapping(String) line: 740 StandardContext.addServletMapping(String, String, boolean) line: 2921 StandardContext.addServletMapping(String, String) line: 2881 WebXml.configureContext(Context) line: 1274 ContextConfig.webConfig() line: 1283 ContextConfig.configureStart() line: 881 ContextConfig.lifecycleEvent(LifecycleEvent) line: 315 LifecycleSupport.fireLifecycleEvent(String, Object) line: 119 StandardContext(LifecycleBase).fireLifecycleEvent(String, Object) line: 89 StandardContext.startInternal() line: 4834 StandardContext(LifecycleBase).start() line: 140 StandardHost(ContainerBase).startInternal() line: 1027 StandardHost.startInternal() line: 788 StandardHost(LifecycleBase).start() line: 140 (2) Set LifecycleState to STARTED. Register context and host on Mapper. Mapper.addHost(String, String[], Object) line: 96 Mapper.addContext(String, Object, String, Object, String[], Context) line: 226 MapperListener.registerContext(Context) line: 339 MapperListener.lifecycleEvent(LifecycleEvent) line: 411 LifecycleSupport.fireLifecycleEvent(String, Object) line: 119 StandardContext(LifecycleBase).fireLifecycleEvent(String, Object) line: 89 StandardContext(LifecycleBase).setState(LifecycleState, Object) line: 325 StandardContext(LifecycleBase).setState(LifecycleState) line: 305 StandardContext(LifecycleBase).start() line: 156 StandardHost(ContainerBase).startInternal() line: 1027 StandardHost.startInternal() line: 788 StandardHost(LifecycleBase).start() line: 140 (3) Register wrapper again. It succeeds because context has been registered on Mapper. Mapper.addWrapper(String, String, String, Object, boolean) line: 328 MapperListener.registerWrapper(Wrapper) line: 394 MapperListener.registerContext(Context) line: 343 MapperListener.lifecycleEvent(LifecycleEvent) line: 411 LifecycleSupport.fireLifecycleEvent(String, Object) line: 119 StandardContext(LifecycleBase).fireLifecycleEvent(String, Object) line: 89 StandardContext(LifecycleBase).setState(LifecycleState, Object) line: 325 StandardContext(LifecycleBase).setState(LifecycleState) line: 305 StandardContext(LifecycleBase).start() line: 156 StandardHost(ContainerBase).startInternal() line: 1027 StandardHost.startInternal() line: 788 StandardHost(LifecycleBase).start() line: 140 Next, StandardHost starts ROOT context. (4) Register wrapper. Then, gets error as follows because context has not been registered.
Is it possible to handle exception on ant build?
Hi, I've done the automation build using build.xml(attached) for our applications. If there is any compilation error on build process, the web.xml needs to be returned to the web-inf directory... or at least handled. Is there a way to put some error handling logic in build.xml? Any help will be greatly appreciated by our team. thanks! http://old.nabble.com/file/p30074458/build.xml build.xml -- View this message in context: http://old.nabble.com/Is-it-possible-to-handle-exception-on-ant-build--tp30074458p30074458.html Sent from the Tomcat - Dev mailing list archive at Nabble.com. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Is it possible to handle exception on ant build?
2010/10/28 pannar : > 1. Your question is about usage of a product, not about developing it. It must be asked on the appropriate users@ mailing list. It is offtopic on d...@. 2. Your question is about Apache Ant. That project lives at http://ant.apache.org Look for manuals and support options there. Offtopic: I think that there are a lot of options to solve your problem. E.g.: 1) check return value (aka exit code) of Ant, 2) use failonerror="false" and errorProperty attributes on the javac task Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Tomcat JDBC Pool in Tomcat 6.0.x / 7.0.x
Hi to all, I'm currently experimenting various DBCP pools for Tomcat and wonder why Filip "jdbc-pool" is not bundled with Tomcat 6.0.x / 7.0.x ? Also, could it be deployed to Maven repo so it could be used and deployed more easily ? Regards - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat JDBC Pool in Tomcat 6.0.x / 7.0.x
2010/10/28 Henri Gomez : > Hi to all, > > I'm currently experimenting various DBCP pools for Tomcat and wonder > why Filip "jdbc-pool" is not bundled with Tomcat 6.0.x / 7.0.x ? > It cannot be distributed, because there are no official releases of it yet. There were several candidate builds, but none gathered enough votes. See [VOTE] threads on dev@ Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Is it possible to handle exception on ant build?
I am new to this forum. Please move redirect me to ant users forum with this thread. I would like to know whether there is any attribute like failOnerror=true on javac tab on the build.xml to avoid deleting the web.xml when the javac compilation fails. Hope you have read my build.xml file. Konstantin Kolinko wrote: > > 2010/10/28 pannar : >> > > 1. Your question is about usage of a product, not about developing it. > It must be asked on the appropriate users@ mailing list. It is > offtopic on d...@. > > 2. Your question is about Apache Ant. That project lives at > http://ant.apache.org Look for manuals and support options there. > > Offtopic: I think that there are a lot of options to solve your > problem. E.g.: 1) check return value (aka exit code) of Ant, 2) use > failonerror="false" and errorProperty attributes on the javac task > > Best regards, > Konstantin Kolinko > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > > -- View this message in context: http://old.nabble.com/Is-it-possible-to-handle-exception-on-ant-build--tp30074458p30075217.html Sent from the Tomcat - Dev mailing list archive at Nabble.com. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Is it possible to handle exception on ant build?
2010/10/28 pannar : > > I am new to this forum. Please move redirect me to ant users forum with this > thread. > It is not a forum. It is a mailing list. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1028252 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: mturk Date: Thu Oct 28 10:39:30 2010 New Revision: 1028252 URL: http://svn.apache.org/viewvc?rev=1028252&view=rev Log: Votes ... Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1028252&r1=1028251&r2=1028252&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 28 10:39:30 2010 @@ -95,7 +95,7 @@ PATCHES PROPOSED TO BACKPORT: http://people.apache.org/~markt/patches/2010-07-07-bug49099.patch This is a backport of: r950587, r950809, r951018, r951093, r951447, r951892, r952295 - +1: markt + +1: markt, mturk -1: @@ -110,7 +110,7 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=962881&view=rev http://svn.apache.org/viewvc?rev=962900&view=rev http://svn.apache.org/viewvc?rev=988448&view=rev - +1: markt + +1: markt, mturk -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49217 @@ -154,7 +154,7 @@ PATCHES PROPOSED TO BACKPORT: Stop accepting new requests (inc keep-alive) once the BIO connector is paused and the current request has finished processing https://issues.apache.org/bugzilla/attachment.cgi?id=26094 - +1: markt, kfujino + +1: markt, kfujino, mturk -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49625 @@ -162,7 +162,7 @@ PATCHES PROPOSED TO BACKPORT: setting it if it is compressed. http://svn.apache.org/viewvc?rev=1002133&view=rev (patch needs to be applied separately to BIO, NIO and APR HTTP connectors) - +1: markt + +1: markt, mturk -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49665 @@ -273,7 +273,7 @@ PATCHES PROPOSED TO BACKPORT: Don't ignore user specified installation directory on 64-bit platforms Allow 32-bit and 64-bit JDKs to be selected on 64-bit platforms http://svn.apache.org/viewvc?rev=1027504&view=rev - +1: markt + +1: markt, mturk -1: * Update Commons daemon to 1.0.4 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat JDBC Pool in Tomcat 6.0.x / 7.0.x
On 28/10/2010 11:02, Henri Gomez wrote: > Hi to all, > > I'm currently experimenting various DBCP pools for Tomcat and wonder > why Filip "jdbc-pool" is not bundled with Tomcat 6.0.x / 7.0.x ? Several reasons: 1. It isn't a 100% compatible drop-in replacement. There are some features in Commons DBCP that jdbc-pool doesn't provide. 2. Every time Filip tried to get votes for a release (and the one time I did) the release failed to collect sufficient votes. There is nothing stopping you using it. Just set the factory attribute for the resource. > Also, could it be deployed to Maven repo so it could be used and > deployed more easily ? No. Not until such time as it has an official release. (That doesn't stop it being added to the ASF snapshot repo). I would also add: - SpringSource is using it as the default pool in tc Server. There have been a few bugs but it looks stable to me. - Commons is currently re-writing Pool and DBCP and using jdbc-pool as the basis. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1028263 - /tomcat/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Thu Oct 28 11:35:48 2010 New Revision: 1028263 URL: http://svn.apache.org/viewvc?rev=1028263&view=rev Log: Add changelog entry for r1027893 Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1028263&r1=1028262&r2=1028263&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 28 11:35:48 2010 @@ -31,12 +31,20 @@ Peter Rossbach Keiichi Fujino Tim Whittington +Mladen Turk Changelog - + + + + +Update to Commons Daemon 1.0.4. (mturk) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1028276 - /tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
Author: markt
Date: Thu Oct 28 12:31:07 2010
New Revision: 1028276
URL: http://svn.apache.org/viewvc?rev=1028276&view=rev
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java?rev=1028276&r1=1028275&r2=1028276&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java Thu Oct 28
12:31:07 2010
@@ -17,9 +17,6 @@
package org.apache.tomcat.util.http.mapper;
-import java.util.ArrayList;
-import java.util.List;
-
import javax.naming.NamingException;
import javax.naming.directory.DirContext;
@@ -183,14 +180,6 @@ public final class Mapper {
}
-public String[] getHosts() {
-String hostN[] = new String[hosts.length];
-for( int i = 0; i < hosts.length; i++ ) {
-hostN[i] = hosts[i].name;
-}
-return hostN;
-}
-
/**
* Set context, used for wrapper mapping (request dispatcher).
@@ -291,25 +280,6 @@ public final class Mapper {
/**
- * Return all contexts, in //HOST/PATH form
- *
- * @return The context names
- */
-public String[] getContextNames() {
-List list = new ArrayList();
-for( int i=0; i list = new ArrayList();
-if( host==null ) host="";
-if( context==null ) context="";
-for( int i=0; i
Re: Is it possible to handle exception on ant build?
> > I am new to this forum. Please move redirect me to ant users forum with this > > thread. > > It is not a forum. It is a mailing list. More precisely, the "real" version of this list is a mailing list. It is copied to several forum sites, which google leads people to instead of the list archives, could be because the forums carry google ads and the mailing list does not, or some such reason. At any rate, We have no control over the forum sites, so you'll just have to get a clue yourself and find out how to "redirect". Please do not ask for help about the forums on this list. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1028295 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Thu Oct 28 13:50:21 2010 New Revision: 1028295 URL: http://svn.apache.org/viewvc?rev=1028295&view=rev Log: Vote, comment. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1028295&r1=1028294&r2=1028295&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 28 13:50:21 2010 @@ -97,7 +97,11 @@ PATCHES PROPOSED TO BACKPORT: r951892, r952295 +1: markt, mturk -1: - + rjung: Would be +1, but one question: in ContainerBase method logAccess(), + if getAccessLog() succeeds, isn't the logging done twice, once there and again + to the parent? It seems either we should check for "!logged" before logging + to the parent (at the moment "logged" isn't used at all), or simply return, because + nothing else is done after parent logging. * Backport the CSRF prevention filter to Tomcat 6 and configure the Manager and Host Manager applications to use it. The configuration is such that the using @@ -118,7 +122,7 @@ PATCHES PROPOSED TO BACKPORT: option to disable this check. https://issues.apache.org/bugzilla/attachment.cgi?id=25727 +1: markt - +1: kkolinko (if doc part is adjusted to the code) + +1: kkolinko, rjung (if doc part is adjusted to the code) -1: kkolinko: doc says the SKIP_* property defaults to false, but in the code the default is true. (Maybe tie it to STRICT_SERVLET_COMPLIANCE?) @@ -168,21 +172,21 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49665 Better handling for missing TLD files. Report JSP filename and location. http://svn.apache.org/viewvc?rev=1002274&view=rev - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49730 Correct race condition in StandardThreadExecutor that can lead to long delays in processing requests. Patch provided by Sylvain Laurent. https://issues.apache.org/bugzilla/attachment.cgi?id=25865 - +1: markt + +1: markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49860 Add support for trailing headers. http://svn.apache.org/viewvc?rev=1003461&view=rev Note: Don't change return type for parseEndChunk(), just return true. - +1: markt + +1: markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50026 @@ -222,32 +226,32 @@ PATCHES PROPOSED TO BACKPORT: Alternative patch: http://people.apache.org/~kkolinko/patches/2010-10-13_tc6_bug49965.patch - +1: kkolinko, kfujino + +1: kkolinko, kfujino, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50072 - NIO connector can mis-read request line if not sent in a single pacaket + NIO connector can mis-read request line if not sent in a single packet https://issues.apache.org/bugzilla/attachment.cgi?id=26173&action=edit +1: markt - +1: kkolinko: if together with r1022323 + +1: kkolinko, rjung: if together with r1022323 -1: Additional patch: http://svn.apache.org/viewvc?rev=1022323&view=rev - +1: kkolinko, markt + +1: kkolinko, markt, rjung -1: Additional patch: * Improve recycling of processors in Http11NioProtocol http://svn.apache.org/viewvc?rev=1022415&view=rev - +1: kkolinko + +1: kkolinko, rjung -1: * Improve sending an access message in DeltaManager. maxInactiveInterval of not Manager but the session is used. If maxInactiveInterval is negative, an access message is not sending. http://svn.apache.org/viewvc?rev=1025924&view=rev - +1: kfujino + +1: kfujino, rjung +1: markt - At first I wondered what the purpose of this code is but on closer inspection DeltaSessions on non-primary nodes are expired at 2*getMaxInactiveInterval() rather than getMaxInactiveInterval() so @@ -279,6 +283,6 @@ PATCHES PROPOSED TO BACKPORT: * Update Commons daemon to 1.0.4 Version 1.0.4 is bug fixing release. (Patch is trivial changing the version number to 1.0.4 in build.properties.default, so not provided) - +1: mturk + +1: mturk, rjung -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1028297 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Thu Oct 28 13:55:34 2010 New Revision: 1028297 URL: http://svn.apache.org/viewvc?rev=1028297&view=rev Log: Vote. Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1028297&r1=1028296&r2=1028297&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Oct 28 13:55:34 2010 @@ -74,7 +74,7 @@ PATCHES PROPOSED TO BACKPORT: maxInactiveInterval of not Manager but the session is used. If maxInactiveInterval is negative, an access message is not sending. http://svn.apache.org/viewvc?rev=1025924&view=rev - +1: kfujino, markt + +1: kfujino, markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50131 @@ -87,6 +87,6 @@ PATCHES PROPOSED TO BACKPORT: * Update Commons daemon to 1.0.4 Version 1.0.4 is bug fixing release. (Patch is trivial changing the version number to 1.0.4 in build.properties.default, so not provided) - +1: mturk + +1: mturk, rjung -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat JDBC Pool in Tomcat 6.0.x / 7.0.x
> Several reasons: > > 1. It isn't a 100% compatible drop-in replacement. There are some > features in Commons DBCP that jdbc-pool doesn't provide. I was thinking at JDBC pool for Datasources management as an alternative to Tomcat DBCP pool based on Common DBCP. > 2. Every time Filip tried to get votes for a release (and the one time I > did) the release failed to collect sufficient votes. May be you could resend a new vote, there is many new commiters today, they may be interested. > There is nothing stopping you using it. Just set the factory attribute > for the resource. I know, but having it bundled with Tomcat is allways better, especially when you are working with community edition of Tomcat. >> Also, could it be deployed to Maven repo so it could be used and >> deployed more easily ? > > No. Not until such time as it has an official release. (That doesn't > stop it being added to the ASF snapshot repo). Any date for official release ? +1 to have it on ASF snapshot repo. org.apache.tomcat jdbc-pool 1.0.8.5-SNAPSHOT > I would also add: > - SpringSource is using it as the default pool in tc Server. There have > been a few bugs but it looks stable to me. It's a gage of stability. Default datasource factory could still use common-dbcp implementation, but jdbc-pool could be provided also. > - Commons is currently re-writing Pool and DBCP and using jdbc-pool as > the basis. Interesting, another sign jdbc-pool is a good implementation. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Is it possible to handle exception on ant build?
Ok thanks much for the info! -- View this message in context: http://old.nabble.com/Is-it-possible-to-handle-exception-on-ant-build--tp30074458p30077149.html Sent from the Tomcat - Dev mailing list archive at Nabble.com. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1028377 - in /tomcat/trunk/java/org/apache/jasper: compiler/JspRuntimeContext.java servlet/JspServletWrapper.java util/Entry.java util/FastRemovalDequeue.java util/JspQueue.java
Author: rjung
Date: Thu Oct 28 16:27:31 2010
New Revision: 1028377
URL: http://svn.apache.org/viewvc?rev=1028377&view=rev
Log:
Overhaul JspQueue, no functional change for Jasper.
- Rename class to FastRemovalDequeue, because
it can be used gnerally. Nothing jsp related in it.
- Rename "head" to "first" as a better match for the
existing "last"
- Switch previous and next: "previous" was
pointing from first to last, "next" from
last to first. Mind-bending.
- Add a bit to the description. Remove "ticket"
language.
- Use more standard terminology "push" to
insert in front and "pop" to remove from last
- Add methods shift and unshift for the operations
at the other ends. Not used yet.
- Add remove() method (not used yet).
- Rename makeYoungest() to moveFirst() and add
moveLast() (not used yet). This data structure
doesn't actually know about young or old.
Add "Entry-" prefix to Entry.toString().
Rename makeFirst() in JspRuntimeContext to
makeYoungest(), because there we actually are using
timestamp information.
Added:
tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java
- copied, changed from r1028286,
tomcat/trunk/java/org/apache/jasper/util/JspQueue.java
Removed:
tomcat/trunk/java/org/apache/jasper/util/JspQueue.java
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/trunk/java/org/apache/jasper/util/Entry.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=1028377&r1=1028376&r2=1028377&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java Thu Oct
28 16:27:31 2010
@@ -41,7 +41,7 @@ import org.apache.jasper.runtime.JspFact
import org.apache.jasper.security.SecurityClassLoad;
import org.apache.jasper.servlet.JspServletWrapper;
import org.apache.jasper.util.ExceptionUtils;
-import org.apache.jasper.util.JspQueue;
+import org.apache.jasper.util.FastRemovalDequeue;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -178,7 +178,7 @@ public final class JspRuntimeContext {
/**
* Keeps JSP pages ordered by last access.
*/
-private JspQueue jspQueue = new
JspQueue();
+private FastRemovalDequeue jspQueue = new
FastRemovalDequeue();
// -- Public Methods
@@ -229,9 +229,9 @@ public final class JspRuntimeContext {
*
* @param ticket the ticket for the jsp.
* */
-public void makeFirst(org.apache.jasper.util.Entry
ticket) {
-synchronized( jspQueue ) {
-jspQueue.makeYoungest(ticket);
+public void makeYoungest(org.apache.jasper.util.Entry
ticket) {
+synchronized(jspQueue) {
+jspQueue.moveFirst(ticket);
}
}
@@ -505,7 +505,7 @@ public final class JspRuntimeContext {
if( jsps.size() > maxLoadedJsps ) {
synchronized( jsps ) {
JspServletWrapper oldest;
-synchronized( jspQueue) {
+synchronized(jspQueue) {
oldest = jspQueue.pop();
}
if (oldest != null) {
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=1028377&r1=1028376&r2=1028377&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Thu Oct
28 16:27:31 2010
@@ -391,7 +391,7 @@ public class JspServletWrapper {
if (ticket == null)
ticket = ctxt.getRuntimeContext().push(this);
else
-ctxt.getRuntimeContext().makeFirst(ticket);
+ctxt.getRuntimeContext().makeYoungest(ticket);
}
}
} catch (UnavailableException ex) {
Modified: tomcat/trunk/java/org/apache/jasper/util/Entry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/util/Entry.java?rev=1028377&r1=1028376&r2=1028377&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/util/Entry.java (original)
+++ tomcat/trunk/java/org/apache/jasper/util/Entry.java Thu Oct 28 16:27:31 2010
@@ -17,8 +17,8 @@
package org.apache.jasper.util;
/**
- * Implementation of a list entry. It exposes links to previous and next
- * elements on package level only.
+
svn commit: r1028389 - /tomcat/trunk/java/org/apache/jasper/util/Entry.java
Author: rjung
Date: Thu Oct 28 17:13:25 2010
New Revision: 1028389
URL: http://svn.apache.org/viewvc?rev=1028389&view=rev
Log:
Reduce visibility. All those are only needed
by the Queue implementation, not by the consumer
of the collection.
Modified:
tomcat/trunk/java/org/apache/jasper/util/Entry.java
Modified: tomcat/trunk/java/org/apache/jasper/util/Entry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/util/Entry.java?rev=1028389&r1=1028388&r2=1028389&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/util/Entry.java (original)
+++ tomcat/trunk/java/org/apache/jasper/util/Entry.java Thu Oct 28 17:13:25 2010
@@ -41,15 +41,15 @@ public class Entry {
this.previous = previous;
}
-public T getContent() {
+protected T getContent() {
return content;
}
-public Entry getPrevious() {
+protected Entry getPrevious() {
return previous;
}
-public Entry getNext() {
+protected Entry getNext() {
return next;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: bugzilla question : bugs fixed in trunk but not yet in tc6
On 23 October 2010 12:05, Mark Thomas wrote: > On 23/10/2010 11:40, Sylvain Laurent wrote: >> so, we lose the information of what bug was fixed in which version for >> tomcat 7 ? (apart from the comments) > > Yes, but that was always the case with Bugzilla. You get the version it > was reported against, not the version it was fixed in. > >> For instance for https://issues.apache.org/bugzilla/show_bug.cgi?id=49625 it >> is now marked for tomcat 6. And only the comments can tell us that it was >> fixed in 7.0.3 ?? > > The primary source of that information is the changelog, not Bugzilla. > Many years ago we used to just add a comment that it was fixed in a > particular major version without the exact version in which it was > fixed. We started adding the fixed version in response to a user's > request. Personally, I don't use it that often - I use the changelog. > > JIRA can track this information (it can also generate changelogs) but I > don't think it is anything the committers have felt they needed. At > least I haven't. > > I'm not against switching to JIRA, but neither am I particularly for it > either. I actually have a slight preference for Bugzilla since I prefer > simple tools that provide the info I need rather than ones that have > lots of bells and whistles that I don't need. > > The Bugzilla search interface is probably its weakest component. We are > due an upgrade to 3.6.x which includes the results of a usability study > which may improve this - I haven't checked yet. IMO search is one of the weakest areas of JIRA. [The other weak area is attachment handling - Bugzilla handles them much better.] However, in this case, JIRA search might not be needed as one can look for "Fix version" directly. > > Mark > > - > 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
svn commit: r1028396 - in /tomcat/trunk/java/org/apache/jasper: compiler/JspRuntimeContext.java servlet/JspServletWrapper.java util/Entry.java util/FastRemovalDequeue.java
Author: rjung
Date: Thu Oct 28 17:30:28 2010
New Revision: 1028396
URL: http://svn.apache.org/viewvc?rev=1028396&view=rev
Log:
Move Entry to an inner class of FastRemovalDequeue.
All implementation details of Entry are now opaque
to the consumer of the FastRemovalDequeue.
Remove double generification when using the inner
class.
Removed:
tomcat/trunk/java/org/apache/jasper/util/Entry.java
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=1028396&r1=1028395&r2=1028396&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java Thu Oct
28 17:30:28 2010
@@ -218,7 +218,7 @@ public final class JspRuntimeContext {
* @param jsw Servlet wrapper for jsp.
* @return a ticket that can be pushed to front of queue at later
execution times.
* */
-public org.apache.jasper.util.Entry
push(JspServletWrapper jsw) {
+public FastRemovalDequeue.Entry push(JspServletWrapper
jsw) {
synchronized (jspQueue) {
return jspQueue.push(jsw);
}
@@ -229,7 +229,7 @@ public final class JspRuntimeContext {
*
* @param ticket the ticket for the jsp.
* */
-public void makeYoungest(org.apache.jasper.util.Entry
ticket) {
+public void makeYoungest(FastRemovalDequeue.Entry
ticket) {
synchronized(jspQueue) {
jspQueue.moveFirst(ticket);
}
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=1028396&r1=1028395&r2=1028396&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Thu Oct
28 17:30:28 2010
@@ -41,8 +41,8 @@ import org.apache.jasper.compiler.JspRun
import org.apache.jasper.compiler.Localizer;
import org.apache.jasper.runtime.InstanceManagerFactory;
import org.apache.jasper.runtime.JspSourceDependent;
-import org.apache.jasper.util.Entry;
import org.apache.jasper.util.ExceptionUtils;
+import org.apache.jasper.util.FastRemovalDequeue;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.InstanceManager;
@@ -87,7 +87,7 @@ public class JspServletWrapper {
/** Timestamp of last time servlet resource was modified */
private volatile long servletClassLastModifiedTime;
private long lastModificationTest = 0L;
-private Entry ticket;
+private FastRemovalDequeue.Entry ticket;
/*
* JspServletWrapper for JSP pages.
Modified: tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java?rev=1028396&r1=1028395&r2=1028396&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java (original)
+++ tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java Thu Oct 28
17:30:28 2010
@@ -23,8 +23,7 @@ package org.apache.jasper.util;
* added to the collection with an Entry type, that is returned to the
consumer.
* When removing an object from the list, the consumer provides this Entry
object.
*
- * The Entry type is mostly opaque to the consumer itself. The consumer can
only
- * retrieve the original object - named content - from the Entry.
+ * The Entry type is completely opaque to the consumer itself.
*
* The Entry object contains the links pointing to the neighbours in the doubly
* linked list, so that removal of an Entry does not need to search for it but
@@ -41,9 +40,9 @@ package org.apache.jasper.util;
public class FastRemovalDequeue {
/** First element of the queue. */
-private Entry first;
+private Entry first;
/** Last element of the queue. */
-private Entry last;
+private Entry last;
/** Initialize empty queue. */
public FastRemovalDequeue() {
@@ -58,8 +57,8 @@ public class FastRemovalDequeue {
* @param object the object to prepend to the start of the list.
* @return an entry for use when the object should be moved.
* */
-public Entry push(final T object) {
-Entry entry = new Entry(object);
+public Entry push(final T object) {
+Entry entry = new Entry(object);
if (first == null) {
Re: svn commit: r1026619 - in /tomcat/taglibs/standard/trunk: compat/ compat/LICENSE.txt compat/NOTICE.txt compat/pom.xml jstlel/ jstlel/LICENSE.txt jstlel/NOTICE.txt jstlel/pom.xml pom.xml
On 23 October 2010 15:33, wrote: > Author: jboynes > Date: Sat Oct 23 14:33:47 2010 > New Revision: 1026619 > > URL: http://svn.apache.org/viewvc?rev=1026619&view=rev > Log: > Add compat and jstlel modules to start refactoring 1.0 support > > Added: > tomcat/taglibs/standard/trunk/compat/ (with props) > tomcat/taglibs/standard/trunk/compat/LICENSE.txt > tomcat/taglibs/standard/trunk/compat/NOTICE.txt > tomcat/taglibs/standard/trunk/compat/pom.xml > tomcat/taglibs/standard/trunk/jstlel/ (with props) > tomcat/taglibs/standard/trunk/jstlel/LICENSE.txt > tomcat/taglibs/standard/trunk/jstlel/NOTICE.txt > tomcat/taglibs/standard/trunk/jstlel/pom.xml All new source files should normally have svn:eol-style set. Looks like your svn properties have not been configured according to: http://www.apache.org/dev/version-control.html#https-svn-config - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1027120 - /tomcat/trunk/webapps/docs/security-howto.xml
On 25 October 2010 14:55, wrote: > Author: markt > Date: Mon Oct 25 13:55:54 2010 > New Revision: 1027120 > > URL: http://svn.apache.org/viewvc?rev=1027120&view=rev > Log: > Fix numerous typos. > Patch provide by Luke Meyer. > > Modified: > tomcat/trunk/webapps/docs/security-howto.xml > > Modified: tomcat/trunk/webapps/docs/security-howto.xml > URL: > http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/security-howto.xml?rev=1027120&r1=1027119&r2=1027120&view=diff > == > --- tomcat/trunk/webapps/docs/security-howto.xml (original) > +++ tomcat/trunk/webapps/docs/security-howto.xml Mon Oct 25 13:55:54 2010 > @@ -33,7 +33,7 @@ > > > > - Tomcat is configured to be reasonable secure for must use cases by > + Tomcat is configured to be reasonably secure for must use cases by Another typo: s/must/most/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1027120 - /tomcat/trunk/webapps/docs/security-howto.xml
On 28 October 2010 18:44, sebb wrote: > On 25 October 2010 14:55, wrote: >> Author: markt >> Date: Mon Oct 25 13:55:54 2010 >> New Revision: 1027120 >> >> URL: http://svn.apache.org/viewvc?rev=1027120&view=rev >> Log: >> Fix numerous typos. >> Patch provide by Luke Meyer. >> >> Modified: >> tomcat/trunk/webapps/docs/security-howto.xml >> >> Modified: tomcat/trunk/webapps/docs/security-howto.xml >> URL: >> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/security-howto.xml?rev=1027120&r1=1027119&r2=1027120&view=diff >> == >> --- tomcat/trunk/webapps/docs/security-howto.xml (original) >> +++ tomcat/trunk/webapps/docs/security-howto.xml Mon Oct 25 13:55:54 2010 >> @@ -33,7 +33,7 @@ >> >> >> >> - Tomcat is configured to be reasonable secure for must use cases by >> + Tomcat is configured to be reasonably secure for must use cases by > > Another typo: > > s/must/most/ > Sorry, I see that has been fixed - I was a bit behind on e-mails. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1027120 - /tomcat/trunk/webapps/docs/security-howto.xml
Mark already fixed it in r1027121. On 28.10.2010 19:44, sebb wrote: On 25 October 2010 14:55, wrote: Author: markt Date: Mon Oct 25 13:55:54 2010 New Revision: 1027120 URL: http://svn.apache.org/viewvc?rev=1027120&view=rev Log: Fix numerous typos. Patch provide by Luke Meyer. Modified: tomcat/trunk/webapps/docs/security-howto.xml Modified: tomcat/trunk/webapps/docs/security-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/security-howto.xml?rev=1027120&r1=1027119&r2=1027120&view=diff == --- tomcat/trunk/webapps/docs/security-howto.xml (original) +++ tomcat/trunk/webapps/docs/security-howto.xml Mon Oct 25 13:55:54 2010 @@ -33,7 +33,7 @@ -Tomcat is configured to be reasonable secure for must use cases by +Tomcat is configured to be reasonably secure for must use cases by Another typo: s/must/most/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1026772 - in /tomcat/trunk/java/org/apache/catalina: ContainerEvent.java Executor.java InstanceEvent.java LifecycleEvent.java LifecycleException.java SessionEvent.java
On 24 October 2010 13:18, wrote:
> Author: markt
> Date: Sun Oct 24 12:18:47 2010
> New Revision: 1026772
>
> URL: http://svn.apache.org/viewvc?rev=1026772&view=rev
> Log:
> Allow Checkstyle's unused imports test to be used with the o.a.catalina
> package
> Fix Eclipse warnings
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/ContainerEvent.java
> tomcat/trunk/java/org/apache/catalina/Executor.java
> tomcat/trunk/java/org/apache/catalina/InstanceEvent.java
> tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java
> tomcat/trunk/java/org/apache/catalina/LifecycleException.java
> tomcat/trunk/java/org/apache/catalina/SessionEvent.java
>
> Modified: tomcat/trunk/java/org/apache/catalina/ContainerEvent.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ContainerEvent.java?rev=1026772&r1=1026771&r2=1026772&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/ContainerEvent.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/ContainerEvent.java Sun Oct 24
> 12:18:47 2010
> @@ -29,9 +29,9 @@ import java.util.EventObject;
> * @version $Id$
> */
>
> -public final class ContainerEvent
> - extends EventObject {
> +public final class ContainerEvent extends EventObject {
>
> + private static final long serialVersionUID = 1L;
>
> /**
> * The Container on which this event occurred.
>
> Modified: tomcat/trunk/java/org/apache/catalina/Executor.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Executor.java?rev=1026772&r1=1026771&r2=1026772&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/Executor.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/Executor.java Sun Oct 24 12:18:47
> 2010
> @@ -16,11 +16,9 @@
> */
> package org.apache.catalina;
>
> -import java.util.concurrent.RejectedExecutionException;
> import java.util.concurrent.TimeUnit;
>
>
> -
> public interface Executor extends java.util.concurrent.Executor, Lifecycle {
> public String getName();
>
> @@ -33,8 +31,8 @@ public interface Executor extends java.u
> * time until it throws a RejectedExecutionException
> *
> * @param command the runnable task
> - * @throws RejectedExecutionException if this task cannot be
> - * accepted for execution - the queue is full
> + * @throws org.apache.catalina.util.RejectedExecutionException if this
> task
Surely that should be:
java.util.concurrent.RejectedExecutionException
> + * cannot be accepted for execution - the queue is full
> * @throws NullPointerException if command or unit is null
> */
> void execute(Runnable command, long timeout, TimeUnit unit);
>
> Modified: tomcat/trunk/java/org/apache/catalina/InstanceEvent.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/InstanceEvent.java?rev=1026772&r1=1026771&r2=1026772&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/InstanceEvent.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/InstanceEvent.java Sun Oct 24
> 12:18:47 2010
> @@ -36,11 +36,9 @@ import javax.servlet.ServletResponse;
> * @version $Id$
> */
>
> -public final class InstanceEvent
> - extends EventObject {
> +public final class InstanceEvent extends EventObject {
>
> -
> - // - Manifest
> Constants
> + private static final long serialVersionUID = 1L;
>
>
> /**
>
> Modified: tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java?rev=1026772&r1=1026771&r2=1026772&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java Sun Oct 24
> 12:18:47 2010
> @@ -32,8 +32,9 @@ import java.util.EventObject;
> * @version $Id$
> */
>
> -public final class LifecycleEvent
> - extends EventObject {
> +public final class LifecycleEvent extends EventObject {
> +
> + private static final long serialVersionUID = 1L;
>
>
> // ---
> Constructors
>
> Modified: tomcat/trunk/java/org/apache/catalina/LifecycleException.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/LifecycleException.java?rev=1026772&r1=1026771&r2=1026772&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/LifecycleException.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/LifecycleException.java Sun Oct 24
> 12:18:47 2010
> @@ -30,6 +30,7 @@ package org.apache.catalina;
>
Re: svn commit: r1026057 - /tomcat/trunk/java/org/apache/naming/SelectorContext.java
On 21 October 2010 17:26, wrote:
> Author: markt
> Date: Thu Oct 21 16:26:50 2010
> New Revision: 1026057
>
> URL: http://svn.apache.org/viewvc?rev=1026057&view=rev
> Log:
> Allow Checkstyle's unused imports test to be used with this class
> Fix Eclipse warnings
>
> Modified:
> tomcat/trunk/java/org/apache/naming/SelectorContext.java
>
> Modified: tomcat/trunk/java/org/apache/naming/SelectorContext.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/SelectorContext.java?rev=1026057&r1=1026056&r2=1026057&view=diff
> ==
> --- tomcat/trunk/java/org/apache/naming/SelectorContext.java (original)
> +++ tomcat/trunk/java/org/apache/naming/SelectorContext.java Thu Oct 21
> 16:26:50 2010
> @@ -23,15 +23,10 @@ import java.util.Hashtable;
> import javax.naming.Binding;
> import javax.naming.Context;
> import javax.naming.Name;
> -import javax.naming.NameAlreadyBoundException;
> import javax.naming.NameClassPair;
> -import javax.naming.NameNotFoundException;
> import javax.naming.NameParser;
> import javax.naming.NamingEnumeration;
> import javax.naming.NamingException;
> -import javax.naming.NotContextException;
> -import javax.naming.OperationNotSupportedException;
> -import javax.naming.directory.InvalidAttributesException;
Does not agree with below:
>
> /**
> * Catalina JNDI Context implementation.
> @@ -125,6 +120,7 @@ public class SelectorContext implements
> * @return the object bound to name
> * @exception NamingException if a naming exception is encountered
> */
> + �...@override
> public Object lookup(Name name)
> throws NamingException {
>
> @@ -147,6 +143,7 @@ public class SelectorContext implements
> * @return the object bound to name
> * @exception NamingException if a naming exception is encountered
> */
> + �...@override
> public Object lookup(String name)
> throws NamingException {
>
> @@ -169,11 +166,13 @@ public class SelectorContext implements
> *
> * @param name the name to bind; may not be empty
> * @param obj the object to bind; possibly null
> - * @exception NameAlreadyBoundException if name is already bound
> - * @exception InvalidAttributesException if object did not supply all
> - * mandatory attributes
> + * @exception javax.naming.NameAlreadyBoundException if name is already
> + * bound
> + * @exception javax.naming.InvalidAttributesException if object did not
> + * supply all mandatory attributes
Does not agree with the import that was removed.
Should be
javax.naming.directory.InvalidAttributesException
> * @exception NamingException if a naming exception is encountered
> */
> + �...@override
> public void bind(Name name, Object obj)
> throws NamingException {
> getBoundContext().bind(parseName(name), obj);
> @@ -185,11 +184,13 @@ public class SelectorContext implements
> *
> * @param name the name to bind; may not be empty
> * @param obj the object to bind; possibly null
> - * @exception NameAlreadyBoundException if name is already bound
> - * @exception InvalidAttributesException if object did not supply all
> - * mandatory attributes
> + * @exception javax.naming.NameAlreadyBoundException if name is already
> + * bound
> + * @exception javax.naming.InvalidAttributesException if object did not
> + * supply all mandatory attributes
> * @exception NamingException if a naming exception is encountered
> */
> + �...@override
> public void bind(String name, Object obj)
> throws NamingException {
> getBoundContext().bind(parseName(name), obj);
> @@ -207,10 +208,11 @@ public class SelectorContext implements
> *
> * @param name the name to bind; may not be empty
> * @param obj the object to bind; possibly null
> - * @exception InvalidAttributesException if object did not supply all
> - * mandatory attributes
> + * @exception javax.naming.InvalidAttributesException if object did not
> + * supply all mandatory attributes
> * @exception NamingException if a naming exception is encountered
> */
> + �...@override
> public void rebind(Name name, Object obj)
> throws NamingException {
> getBoundContext().rebind(parseName(name), obj);
> @@ -222,10 +224,11 @@ public class SelectorContext implements
> *
> * @param name the name to bind; may not be empty
> * @param obj the object to bind; possibly null
> - * @exception InvalidAttributesException if object did not supply all
> - * mandatory attributes
> + * @exception javax.naming.InvalidAttributesException if object did not
> + * supply all mandatory attributes
> * @exception NamingException if a naming exception is encountered
> */
> + �...@override
> public void rebind(String name, Object obj)
> throws NamingExc
DO NOT REPLY [Bug 50175] New: Enhance memory leak detection by selectively applying methods,
https://issues.apache.org/bugzilla/show_bug.cgi?id=50175 Summary: Enhance memory leak detection by selectively applying methods, Product: Tomcat 7 Version: trunk Platform: All OS/Version: All Status: NEW Severity: enhancement Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: bugzi...@pidster.com Memory leak detection on application unload can be enhanced by selectively applying the various methods, depending on whether Tomcat is shutting down or undeploying/reloading an application. Many of the memory leak detection methods can be ignored if a JVM is shutting down. Non-daemon threads may pose an issue for a system, if they cause the Tomcat process to stay alive and continue to consume memory and/or system resources, so continuing to detect and report these is probably worthwhile. This could be accomplished by setting a System property during the first phase of the shutdown process and checking for this property during the application undeployment process. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 50175] Enhance memory leak detection by selectively applying methods,
https://issues.apache.org/bugzilla/show_bug.cgi?id=50175 --- Comment #1 from Pid 2010-10-28 17:12:37 EDT --- Created an attachment (id=26223) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26223) Simple patch illustrating idea Adds a system property and checks for it during app undeploy. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 50175] Enhance memory leak detection by selectively applying methods,
https://issues.apache.org/bugzilla/show_bug.cgi?id=50175 Leon Rosenberg changed: What|Removed |Added CC||rosenberg.l...@gmail.com -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1028521 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/tomcat/util/http/mapper/ test/org/apache/tomcat/ut
Author: markt
Date: Thu Oct 28 22:29:25 2010
New Revision: 1028521
URL: http://svn.apache.org/viewvc?rev=1028521&view=rev
Log:
Provide configuration option to work around new welcome file mapping
requirements of section 10.10 Servlet 3.0 that break a lot of existing apps.
The default configuration retains the current Tomcat 6.0.x behaviour. Enabling
STRICT_SERVLET_COMPLILANCE enforces the new requirements by default. Includes
test cases.
Added:
tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
(with props)
tomcat/trunk/test/webapp-3.0/welcome-files/
tomcat/trunk/test/webapp-3.0/welcome-files/index.jsp (with props)
tomcat/trunk/test/webapp-3.0/welcome-files/sub/
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapper.java
tomcat/trunk/webapps/docs/config/context.xml
tomcat/trunk/webapps/docs/config/systemprops.xml
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1028521&r1=1028520&r2=1028521&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Thu Oct 28 22:29:25 2010
@@ -1252,5 +1252,28 @@ public interface Context extends Contain
*/
Set addServletSecurity(ApplicationServletRegistration registration,
ServletSecurityElement servletSecurityElement);
+
+/**
+ * Sets the (comma separated) list of Servlets that expect a resource to be
+ * present. Used to ensure that welcome files associated with Servlets that
+ * expect a resource to be present are not mapped when there is no
resource.
+ */
+public void setResourceOnlyServlets(String resourceOnlyServlets);
+
+/**
+ * Obtains the list of Servlets that expect a resource to be present.
+ *
+ * @return A comma separated list of Servlet names as used in web.xml
+ */
+public String getResourceOnlyServlets();
+
+/**
+ * Checks the named Servlet to see if it expects a resource to be present.
+ *
+ * @param servletName Name of the Servlet (as per web.xml) to check
+ * @return true if the Servlet expects a
resource,
+ * otherwise false
+ */
+public boolean isResourceOnlyServlet(String servletName);
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=1028521&r1=1028520&r2=1028521&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java Thu Oct
28 22:29:25 2010
@@ -156,18 +156,18 @@ public class MapperListener implements C
} else if (event.getType() == Wrapper.ADD_MAPPING_EVENT) {
// Handle dynamically adding wrappers
Wrapper wrapper = (Wrapper) event.getSource();
-
-String contextName = wrapper.getParent().getName();
+Context context = (Context) wrapper.getParent();
+String contextName = context.getName();
if ("/".equals(contextName)) {
contextName = "";
}
-String hostName = wrapper.getParent().getParent().getName();
-
+String hostName = context.getParent().getName();
+String wrapperName = wrapper.getName();
String mapping = (String) event.getData();
-boolean jspWildCard = ("jsp".equals(wrapper.getName())
+boolean jspWildCard = ("jsp".equals(wrapperName)
&& mapping.endsWith("/*"));
mapper.addWrapper(hostName, contextName, mapping, wrapper,
-jspWildCard);
+jspWildCard, context.isResourceOnlyServlet(wrapperName));
} else if (event.getType() == Wrapper.REMOVE_MAPPING_EVENT) {
// Handle dynamically removing wrappers
Wrapper wrapper = (Wrapper) event.getSource();
@@ -380,11 +380,12 @@ public class MapperListener implements C
private void registerWrapper(Wrapper wrapper) {
String wrapperName = wrapper.getName();
-String contextName = wrapper.getParent().getName();
+Context context = (Context) wrapper.getParent();
+String contextName = context.getName();
if ("/".equals(contextName)) {
contextName = "";
}
-String hostName = wrapper.getPar
DO NOT REPLY [Bug 49422] hudson does not work on tomcat 7.0.0 rc4
https://issues.apache.org/bugzilla/show_bug.cgi?id=49422 --- Comment #8 from Mark Thomas 2010-10-28 18:32:17 EDT --- The new Servlet 3.0 requirements have caused a number of issues. As of Tomcat 7.0.5 a new context option is available "resourceOnlyServlets" that can be used to list Servlets that expect physical resources to exist. By default the JSP Servlet is included in this list that should restore 7.0.5+ to the current 6.0.x behaviour regarding welcome files. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1028522 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu Oct 28 22:33:45 2010 New Revision: 1028522 URL: http://svn.apache.org/viewvc?rev=1028522&view=rev Log: Add new feature Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1028522&r1=1028521&r2=1028522&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 28 22:33:45 2010 @@ -76,6 +76,13 @@ Expose names of LifecycleListeners and ContainerListers for StandardContext via JMX. (markt) + +Add a new option, resourceOnlyServlets, to Context elements +that provides a mechanism for working around the issues caused by new +requirements for welcome file mapping introduced in Servlet 3.0. By +default, the existing Tomcat 6.0.x welcome file handling is used. +(markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1028523 - /tomcat/trunk/webapps/docs/config/context.xml
Author: markt Date: Thu Oct 28 22:34:52 2010 New Revision: 1028523 URL: http://svn.apache.org/viewvc?rev=1028523&view=rev Log: Missing closing tag Modified: tomcat/trunk/webapps/docs/config/context.xml Modified: tomcat/trunk/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1028523&r1=1028522&r2=1028523&view=diff == --- tomcat/trunk/webapps/docs/config/context.xml (original) +++ tomcat/trunk/webapps/docs/config/context.xml Thu Oct 28 22:34:52 2010 @@ -248,7 +248,7 @@ org.apache.catalina.STRICT_SERVLET_COMPLIANCE system property is set to true, the default value of this attribute will be the empty -string, else the default value will be jsp. +string, else the default value will be jsp. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1028547 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/session/PersistentManagerBase.java webapps/docs/changelog.xml
Author: kkolinko Date: Thu Oct 28 23:42:42 2010 New Revision: 1028547 URL: http://svn.apache.org/viewvc?rev=1028547&view=rev Log: Improve exception handling in PersistentManagerBase when running with a security manager. Fixes https://issues.apache.org/bugzilla/show_bug.cgi?id=50128 It is backport of r1026784,1026912,1026920 Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 28 23:42:42 2010 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686 ,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,963868,964614,966177-966178,966292,966692,981815,991837,993042,1001955,1002185,1002263,1002349,1002359,1002362,1002481,1002514,1003481,1003488,1003556,1003572,1003581,1003861,1004868-1004869,1005452,1005467,1005647,1005802,1022120,1022134,1022606,1022623,1024224,1024251,1026042 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,
DO NOT REPLY [Bug 50128] Potential NPI in PersistentMananagerBase
https://issues.apache.org/bugzilla/show_bug.cgi?id=50128 --- Comment #2 from Konstantin Kolinko 2010-10-28 19:44:40 EDT --- Fixed in 6.0 by r1028547, will be in 6.0.30 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1028554 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/valves/PersistentValve.java webapps/docs/changelog.xml
Author: kkolinko
Date: Thu Oct 28 23:58:00 2010
New Revision: 1028554
URL: http://svn.apache.org/viewvc?rev=1028554&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50131
Avoid possible NPE in debug output in PersistentValve.
Based on the patch provided by sebb
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/PersistentValve.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1028554&r1=1028553&r2=1028554&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 28 23:58:00 2010
@@ -258,13 +258,6 @@ PATCHES PROPOSED TO BACKPORT:
this makes sense.
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50131
- Avoid possible NPE in debug output in PersistentValve.
- Patch by sebb
- https://issues.apache.org/bugzilla/attachment.cgi?id=26194
- +1: kkolinko, kfujino, markt
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50140
Don't ignore user specified installation directory on 64-bit platforms
Allow 32-bit and 64-bit JDKs to be selected on 64-bit platforms
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/PersistentValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/PersistentValve.java?rev=1028554&r1=1028553&r2=1028554&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/PersistentValve.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/PersistentValve.java
Thu Oct 28 23:58:00 2010
@@ -178,9 +178,11 @@ public class PersistentValve
} else {
if (container.getLogger().isDebugEnabled())
container.getLogger().debug("newsessionId store: " +
store + " session: " +
-session + " valid: " + session.isValid() +
-" Staled: " +
-isSessionStale(session,
System.currentTimeMillis()));
+session +
+(session == null ? "" :
+" valid: " + session.isValid() +
+" stale: " +
+isSessionStale(session,
System.currentTimeMillis(;
}
} else {
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1028554&r1=1028553&r2=1028554&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Oct 28 23:58:00 2010
@@ -138,6 +138,10 @@
when running with a security manager. (kkolinko)
+50131: Avoid possible NPE in debug output in
PersistentValve.
+Patch provided by sebb. (kkolinko)
+
+
50138: Fix threading issues in
org.apache.catalina.security.SecurityUtil. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50131] PersistentValve.invoke - possible NPE at line 186
https://issues.apache.org/bugzilla/show_bug.cgi?id=50131 --- Comment #3 from Konstantin Kolinko 2010-10-28 19:59:54 EDT --- Fixed in 6.0 by r1028554, will be in 6.0.30. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1028556 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/catalina/valves/PersistentValve.java container/webapps/docs/changelog.xml
Author: kkolinko
Date: Fri Oct 29 00:03:47 2010
New Revision: 1028556
URL: http://svn.apache.org/viewvc?rev=1028556&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50131
Avoid possible NPE in debug output in PersistentValve.
Based on the patch provided by sebb
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/PersistentValve.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1028556&r1=1028555&r2=1028556&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Oct 29 00:03:47 2010
@@ -77,13 +77,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kfujino, markt, rjung
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50131
- Avoid possible NPE in debug output in PersistentValve.
- Patch by sebb
- https://issues.apache.org/bugzilla/attachment.cgi?id=26194
- +1: kkolinko, kfujino, markt
- -1:
-
* Update Commons daemon to 1.0.4
Version 1.0.4 is bug fixing release. (Patch is trivial changing the version
number to 1.0.4 in build.properties.default, so not provided)
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/PersistentValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/PersistentValve.java?rev=1028556&r1=1028555&r2=1028556&view=diff
==
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/PersistentValve.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/PersistentValve.java
Fri Oct 29 00:03:47 2010
@@ -178,9 +178,11 @@ public class PersistentValve
} else {
if (container.getLogger().isDebugEnabled())
container.getLogger().debug("newsessionId store: " +
store + " session: " +
-session + " valid: " + session.isValid() +
-" Staled: " +
-isSessionStale(session,
System.currentTimeMillis()));
+session +
+(session == null ? "" :
+" valid: " + session.isValid() +
+" stale: " +
+isSessionStale(session,
System.currentTimeMillis(;
}
} else {
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1028556&r1=1028555&r2=1028556&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Fri Oct 29
00:03:47 2010
@@ -50,6 +50,10 @@
+50131: Avoid possible NPE in debug output in
PersistentValve.
+Patch provided by sebb. (kkolinko)
+
+
Avoid unnecessary cast in StandardContext. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50131] PersistentValve.invoke - possible NPE at line 186
https://issues.apache.org/bugzilla/show_bug.cgi?id=50131 --- Comment #4 from Konstantin Kolinko 2010-10-28 20:05:40 EDT --- Fixed in 5.5 by r1028556, will be in 5.5.32. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1028559 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/realm/JAASMemoryLoginModule.java java/org/apache/catalina/realm/JAASRealm.java webapps/docs/changelog.xml
Author: kkolinko
Date: Fri Oct 29 00:12:59 2010
New Revision: 1028559
URL: http://svn.apache.org/viewvc?rev=1028559&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49965
Use correct i18n resources for StringManager in JAASRealm
Fixed using the "alternative" patch.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1028559&r1=1028558&r2=1028559&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Oct 29 00:12:59 2010
@@ -213,22 +213,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt
-0: kkolinko: see Re:r1005192 thread on dev@
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49965
- Use correct i18n resources for StringManager in JAASRealm
- http://people.apache.org/~markt/patches/2010-10-07-bug49965-tc6.patch
- (Port of http://svn.apache.org/viewvc?view=revision&revision=920820)
- +1: markt
- -1:
- -0: kkolinko: It is amazing that the patch just removes N lines and fixes
-the issue, but I think that removing static protected fields is not
-good for binary compatibility between releases. Alternative patch
-proposed below.
-
- Alternative patch:
- http://people.apache.org/~kkolinko/patches/2010-10-13_tc6_bug49965.patch
- +1: kkolinko, kfujino, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50072
NIO connector can mis-read request line if not sent in a single packet
https://issues.apache.org/bugzilla/attachment.cgi?id=26173&action=edit
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java?rev=1028559&r1=1028558&r2=1028559&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
Fri Oct 29 00:12:59 2010
@@ -39,7 +39,6 @@ import javax.security.auth.spi.LoginModu
import org.apache.catalina.Context;
import org.apache.catalina.Realm;
-import org.apache.catalina.authenticator.Constants;
import org.apache.catalina.connector.Request;
import org.apache.catalina.deploy.SecurityConstraint;
import org.apache.catalina.util.RequestUtil;
@@ -355,10 +354,10 @@ public class JAASMemoryLoginModule exten
if (authMethod == null) {
// BASIC or FORM
principal = super.authenticate(username, password);
-} else if (authMethod.equals(Constants.DIGEST_METHOD)) {
+} else if
(authMethod.equals(org.apache.catalina.authenticator.Constants.DIGEST_METHOD)) {
principal = super.authenticate(username, password, nonce, nc,
cnonce, qop, realmName, md5a2);
-} else if (authMethod.equals(Constants.CERT_METHOD)) {
+} else if
(authMethod.equals(org.apache.catalina.authenticator.Constants.CERT_METHOD)) {
principal = super.getPrincipal(username);
} else {
throw new LoginException("Unknown authentication method");
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=1028559&r1=1028558&r2=1028559&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java Fri Oct
29 00:12:59 2010
@@ -34,7 +34,6 @@ import javax.security.auth.login.LoginEx
import org.apache.catalina.Container;
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.authenticator.Constants;
import org.apache.catalina.util.StringManager;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -357,7 +356,7 @@ public class JAASRealm
return authenticate(username,
new JAASCallbackHandler(this, username, clientDigest, nonce,
nc, cnonce, qop, realmName, md5a2,
-Constants.DIGEST_METHOD));
+
org.apache.catalina.authenticator.Constants.DIGEST_METHOD));
}
@@ -483,7 +482,8 @@ public class JAASRealm
return authenticate(username,
new JAASCallbackHandler(this, username, null, null, null, null,
-null, null, null, Constants.CERT_METHOD));
+null, null, n
DO NOT REPLY [Bug 49965] JAASRealm uses wrong string constants
https://issues.apache.org/bugzilla/show_bug.cgi?id=49965 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Konstantin Kolinko 2010-10-28 20:15:47 EDT --- Fixed in 6.0 by r1028559, will be in 6.0.30. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1028562 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/jasper/compiler/ webapps/docs/
Author: kkolinko Date: Fri Oct 29 00:37:33 2010 New Revision: 1028562 URL: http://svn.apache.org/viewvc?rev=1028562&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49665 Better handling for missing TLD files. Report JSP filename and location. Patch provided by Ted Leung. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Oct 29 00:37:33 2010 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686 ,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,963868,964614,966177-966178,966292,966692,981815,991837,993042,1001955,1002185,1002263,1002349,1002359,1002362,1002481,1002514,1003481,1003488,1003556,1003572,1003581,1003861,1004868-1004869,1005452,1005467,1005647,1005802,1022120,1022134,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746
DO NOT REPLY [Bug 49665] When file not found error occurs it does not tell you which file caused the error.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49665 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #5 from Konstantin Kolinko 2010-10-28 20:39:15 EDT --- Fixed in 6.0 by r1028562, will be in 6.0.30. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1028565 - /tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Author: kkolinko
Date: Fri Oct 29 00:56:05 2010
New Revision: 1028565
URL: http://svn.apache.org/viewvc?rev=1028565&view=rev
Log:
Use correct arguments for an error message in TagLibraryInfoImpl.
It is a followup to r937791
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=1028565&r1=1028564&r2=1028565&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Fri
Oct 29 00:56:05 2010
@@ -179,7 +179,7 @@ class TagLibraryInfoImpl extends TagLibr
parseTLD(jarResource.getUrl(), in, jarResource);
} catch (Exception ex) {
err.jspError(mark, "jsp.error.tld.unable_to_read",
jarResource.getUrl(),
-jarResource.getUrl(), ex.toString());
+tldName, ex.toString());
}
}
} finally {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1028575 - /tomcat/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Fri Oct 29 01:13:43 2010 New Revision: 1028575 URL: http://svn.apache.org/viewvc?rev=1028575&view=rev Log: Add changelog entry for r1005802 Also corrected a typo Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1028575&r1=1028574&r2=1028575&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Fri Oct 29 01:13:43 2010 @@ -241,7 +241,7 @@ even if the web application is marked as meta-data complete. (markt) -500063: Correct regression in fix for 50059 that +50063: Correct regression in fix for 50059 that causes applications marked as meta-data complete to return 404s for all requests. Patch provided by heyoulin. (markt) @@ -321,6 +321,10 @@ + +48716: Do not call reset if the default LogManager is in use. +(markt) + 50013: Correctly package classes from org.apache.tomcat.util.file and add the tomcat-util.jar to - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1028576 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Fri Oct 29 01:17:29 2010 New Revision: 1028576 URL: http://svn.apache.org/viewvc?rev=1028576&view=rev Log: Add changelog entry for r1024318 Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1028576&r1=1028575&r2=1028576&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Oct 29 01:17:29 2010 @@ -249,6 +249,10 @@ + +48716: Do not call reset if the default LogManager is in use. +(markt) + Use native line endings for example Eclipse configuration files in source distribution. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1028585 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Oct 29 01:44:30 2010 New Revision: 1028585 URL: http://svn.apache.org/viewvc?rev=1028585&view=rev Log: add a note Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1028585&r1=1028584&r2=1028585&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Oct 29 01:44:30 2010 @@ -242,6 +242,7 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1027504&view=rev +1: markt, mturk -1: + kkolinko: merging r1027504 does not perform cleanly * Update Commons daemon to 1.0.4 Version 1.0.4 is bug fixing release. (Patch is trivial changing the version - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1028592 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/ha/session/DeltaManager.java webapps/docs/changelog.xml
Author: kfujino
Date: Fri Oct 29 02:53:53 2010
New Revision: 1028592
URL: http://svn.apache.org/viewvc?rev=1028592&view=rev
Log:
Improve sending an access message in DeltaManager.
maxInactiveInterval of not Manager but the session is used.
If maxInactiveInterval is negative, an access message is not sending.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1028592&r1=1028591&r2=1028592&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Oct 29 02:53:53 2010
@@ -225,17 +225,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, rjung
-1:
-* Improve sending an access message in DeltaManager.
- maxInactiveInterval of not Manager but the session is used.
- If maxInactiveInterval is negative, an access message is not sending.
- http://svn.apache.org/viewvc?rev=1025924&view=rev
- +1: kfujino, rjung
- +1: markt - At first I wondered what the purpose of this code is but on
closer
- inspection DeltaSessions on non-primary nodes are expired at
- 2*getMaxInactiveInterval() rather than getMaxInactiveInterval()
so
- this makes sense.
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50140
Don't ignore user specified installation directory on 64-bit platforms
Allow 32-bit and 64-bit JDKs to be selected on 64-bit platforms
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1028592&r1=1028591&r2=1028592&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Fri Oct 29 02:53:53 2010
@@ -1250,7 +1250,8 @@ public class DeltaManager extends Cluste
//check to see if we need to send out an access message
if (!expires && (msg == null)) {
long replDelta = System.currentTimeMillis() -
session.getLastTimeReplicated();
-if (replDelta > (getMaxInactiveInterval() * 1000)) {
+if (session.getMaxInactiveInterval() >=0 &&
+replDelta > (session.getMaxInactiveInterval() * 1000))
{
counterSend_EVT_SESSION_ACCESSED++;
msg = new SessionMessageImpl(getName(),
SessionMessage.EVT_SESSION_ACCESSED,
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1028592&r1=1028591&r2=1028592&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Oct 29 02:53:53 2010
@@ -237,6 +237,12 @@
Add support for maxActiveSessions attribute to BackupManager. (kfujino)
+
+Improve sending an access message in DeltaManager.
+maxInactiveInterval of not Manager but the session is used.
+If maxInactiveInterval is negative, an access message is not sending.
+(kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50177] New: Heap size or memory issue?
https://issues.apache.org/bugzilla/show_bug.cgi?id=50177 Summary: Heap size or memory issue? Product: Tomcat 6 Version: unspecified Platform: HP OS/Version: Linux Status: NEW Severity: major Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: lok...@hotmail.com Created an attachment (id=26224) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26224) thread dump infor I am new to interpreting thread dumps. Pls advise on the following. Heap PSYoungGen total 631424K, used 597381K [0x2aab2376, 0x2aab4e20, 0x2aab4e20) eden space 566848K, 94% used [0x2aab2376,0x2aab43fbbb90,0x2aab460f) from space 64576K, 99% used [0x2aab460f,0x2aab49ff5b40,0x2aab4a00) to space 67584K, 0% used [0x2aab4a00,0x2aab4a00,0x2aab4e20) PSOldGentotal 1398144K, used 738438K [0x2aaace20, 0x2aab2376, 0x2aab2376) object space 1398144K, 52% used [0x2aaace20,0x2aaafb321be0,0x2aab2376) PSPermGen total 86528K, used 86418K [0x2e20, 0x2aaab368, 0x2aaace20) object space 86528K, 99% used [0x2e20,0x2aaab3664af0,0x2aaab368) 2010-10-27 17:36:24,610 INFO info.magnolia.module.ModuleManagerImpl : Stopping module ssc-ts 2010-10-27 17:36:24,611 INFO com.ssc.common.service.ServiceManager : ServiceManager Shutdown 2010-10-27 17:36:24,611 INFO com.ssc.common.service.AbstractService : icanservice - Stop 2010-10-27 17:36:24,611 INFO com.ssc.common.service.AbstractService : icanservice - Stopped 2010-10-27 17:36:24,611 INFO com.ssc.common.service.ServiceManager : ServiceManager Shutdown Complete 2010-10-27 17:36:24,611 INFO info.magnolia.module.ModuleManagerImpl : Stopping module adminInterface 2010-10-27 17:36:24,611 INFO info.magnolia.module.ModuleManagerImpl : Stopping module templating 2010-10-27 17:36:24,611 INFO info.magnolia.module.ModuleManagerImpl : Stopping module core 2010-10-27 17:36:24,616 INFO info.magnolia.cms.beans.config.ContentRepository : Shutting down JCR 2010-10-27 17:36:24,616 INFO info.magnolia.jackrabbit.ProviderImpl : Shutting down repository bound to 'public' Shutting down Log4J log4j:ERROR LogMananger.repositorySelector was null likely due to error in class reloading, using NOPLoggerRepository. 283453.181: [GC [PSYoungGen: 631382K->67583K(616448K)] 1369821K->815331K(2014592K), 0.0744150 secs] [Times: user=0.17 sys=0.03, real=0.08 secs] WARN: The method class org.apache.commons.logging.impl.SLF4JLogFactory#release() was invoked. WARN: Please see http://www.slf4j.org/codes.html#release for an explanation. Destroying JForum... 2010-10-27 17:36:27,845 INFO info.magnolia.module.ModuleManagerImpl : Stopping module ssc-ts 2010-10-27 17:36:27,845 INFO com.ssc.common.service.ServiceManager : ServiceManager Shutdown 2010-10-27 17:36:27,846 INFO com.ssc.common.service.AbstractService : icanservice - Stop 2010-10-27 17:36:27,846 INFO com.ssc.common.service.AbstractService : icanservice - Stopped 2010-10-27 17:36:27,846 INFO com.ssc.common.service.ServiceManager : ServiceManager Shutdown Complete 2010-10-27 17:36:27,846 INFO info.magnolia.module.ModuleManagerImpl : Stopping module adminInterface 2010-10-27 17:36:27,846 INFO info.magnolia.module.ModuleManagerImpl : Stopping module templating 2010-10-27 17:36:27,846 INFO info.magnolia.module.ModuleManagerImpl : Stopping module core 2010-10-27 17:36:27,857 INFO info.magnolia.cms.beans.config.ContentRepository : Shutting down JCR 2010-10-27 17:36:27,857 INFO info.magnolia.jackrabbit.ProviderImpl : Shutting down repository bound to 'author5admin' Shutting down Log4J log4j:ERROR LogMananger.repositorySelector was null likely due to error in class reloading, using NOPLoggerRepository. WARN: The method class org.apache.commons.logging.impl.SLF4JLogFactory#release() was invoked. WARN: Please see http://www.slf4j.org/codes.html#release for an explanation. Heap PSYoungGen total 616448K, used 136533K [0x2aab2376, 0x2aab4e20, 0x2aab4e20) eden space 548864K, 12% used [0x2aab2376,0x2aab27ab5770,0x2aab44f6) from space 67584K, 99% used [0x2aab4a00,0x2aab4e1fff68,0x2aab4e20) to space 75072K, 0% used [0x2aab44f6,0x2aab44f6,0x2aab498b) PSOldGentotal 1398144K, used 747748K [0x2aaace20, 0x2aab2376, 0x2aab2376) object space 1398144K, 53% used [0x2aaace20,0x2aaafbc39058,0x2aab2376) PSPermGen total 91904K, used 91723K [0x2e20, 0x2aaab3bc, 0x2aaace20)
svn commit: r1028618 - in /tomcat/tc5.5.x/trunk: ./ container/modules/cluster/src/share/org/apache/catalina/cluster/session/ container/modules/ha/src/share/org/apache/catalina/ha/session/ container/we
Author: kfujino
Date: Fri Oct 29 05:22:16 2010
New Revision: 1028618
URL: http://svn.apache.org/viewvc?rev=1028618&view=rev
Log:
Improve sending an access message in DeltaManager.
maxInactiveInterval of not Manager but the session is used.
If maxInactiveInterval is negative, an access message is not sending.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1028618&r1=1028617&r2=1028618&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Oct 29 05:22:16 2010
@@ -70,13 +70,6 @@ PATCHES PROPOSED TO BACKPORT:
, but moving to 6.0 is a decent soln.
Probably not worth changing this late in the evolution of 5.5.
-* Improve sending an access message in DeltaManager.
- maxInactiveInterval of not Manager but the session is used.
- If maxInactiveInterval is negative, an access message is not sending.
- http://svn.apache.org/viewvc?rev=1025924&view=rev
- +1: kfujino, markt, rjung
- -1:
-
* Update Commons daemon to 1.0.4
Version 1.0.4 is bug fixing release. (Patch is trivial changing the version
number to 1.0.4 in build.properties.default, so not provided)
Modified:
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=1028618&r1=1028617&r2=1028618&view=diff
==
---
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
(original)
+++
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Fri Oct 29 05:22:16 2010
@@ -1452,8 +1452,8 @@ public class DeltaManager extends Manage
long replDelta = System.currentTimeMillis()
- session.getLastTimeReplicated();
if (replDelta >= updateActiveInterval*1000 ||
-(getMaxInactiveInterval()>=0 &&
-replDelta >= getMaxInactiveInterval()*1000)) {
+(session.getMaxInactiveInterval()>=0 &&
+replDelta >= session.getMaxInactiveInterval()*1000)) {
counterSend_EVT_SESSION_ACCESSED++;
msg = new SessionMessageImpl(getName(),
SessionMessage.EVT_SESSION_ACCESSED, null,
Modified:
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java?rev=1028618&r1=1028617&r2=1028618&view=diff
==
---
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
Fri Oct 29 05:22:16 2010
@@ -1232,7 +1232,8 @@ public class DeltaManager extends Cluste
//check to see if we need to send out an access message
if (!expires && (msg == null)) {
long replDelta = System.currentTimeMillis() -
session.getLastTimeReplicated();
-if (replDelta > (getMaxInactiveInterval() * 1000)) {
+if (session.getMaxInactiveInterval() >=0 &&
+replDelta > (session.getMaxInactiveInterval() * 1000))
{
counterSend_EVT_SESSION_ACCESSED++;
msg = new SessionMessageImpl(getName(),
SessionMessage.EVT_SESSION_ACCESSED,
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1028618&r1=1028617&r2=1028618&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Fri Oct 29
05:22:16 2010
@@ -65,6 +65,16 @@
+
+
+
+Improve sending an access message in DeltaManager.
+maxInactiveInterval of not Manager but the session is used.
+If maxInactiveInterval is negative, an access message is not sending
DO NOT REPLY [Bug 50177] Heap size or memory issue?
https://issues.apache.org/bugzilla/show_bug.cgi?id=50177 Pid changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Pid 2010-10-29 02:34:06 EDT --- Bugzilla is not a support forum. You may find some assistance on the Tomcat Users mailing list, if you ask a specific question. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
