Re: Tomcat Native: APR Http Endpoint handler behavior under Windows
Hi Mladen...I'd be also be interested in your thoughts about the main aspect to my question concerning JBossWeb behaviour with APR in regards to new connection establishment. Specifically, because on Win32 the backlog queue is limited to 200, it's easy to get not very graceful DoS behavior to a relatively small flood of new connections if the worker threads are all rather busy, because a worker thread is needed to get the connection open. Assume that SSL is switched off. I proposed that the socket should be moved over to the poller straight away (with a deferred accept on the actual request) and that this be done in the context of the acceptor thread? Cheers...MT Mladen Turk wrote: Remy Maucherat wrote: Why is poller performance bad in Windows? Is that a consequence of the I've been told it uses select, which works only on 64 sockets at a time. So if you have a large poller, then the poll call performance degrades. Mladen is really the only one who can answer Windows questions. (personally, I think it is a lot cause for really high scalability) Well, we are forcing it to 1024 by setting the FD_SIZE before including the socket. Anyhow, this still requires multiple poller threads. The Vista+ windows has WSAPoll which is equivalent even on the API level to unix poll, and it doesn't bring any limitation on the pollset size. I've tested it with 32K sockets, and there is no performance degradations caused by the size like there is on the select implementation. I've added the WASPoll support to APR2, but there are some other things with APR2 that are still to be resolved before we can create tomcat-native 2. It merged with apr-util and introduced feature modules, so instead one it might end up with tens of dll's. Regards - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46597] Not all cookie changes in 6.0.x branch have been ported to 5.5.x
https://issues.apache.org/bugzilla/show_bug.cgi?id=46597 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #7 from Mark Thomas ma...@apache.org 2009-04-29 02:38:43 PST --- This patch has been applied to 5.5.x and will be in 5.5.28 onwards. -- 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 46538] ETag must differ between compressed and uncompressed resource versions
https://issues.apache.org/bugzilla/show_bug.cgi?id=46538 --- Comment #11 from Mark Thomas ma...@apache.org 2009-04-29 03:00:51 PST --- The current state of T-E support in the browsers is: - Opera advertises T-E support, works with T-E - Moziila doesn't advertise T-E support, works with T-E - IE doesn't advertise T-E support, doesn't work with T-E My reading of the C-E discussion above is that any solution is a hack that will have an issue somewhere. T-E is the right solution. Moving from the current status quo is as likely or more likely to cause issues compared to the current behaviour which while wrong, is at least understood. We could provide a handful of options to allow users to configure the various hacks but this would add a lot of code (and possibly complexity) to the critical path. I would like to use T-E by default and fallback to C-E if T-E is not supported. However, the patchy browser support means that another set of options would be required to give folks a reasonable chance of configuring a 'good' behaviour for most clients. My inclination is to mark this issue as WONTFIX with the longer term plan being implementing T-E and switching to T-E once the browser support is reasonable. -- 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: r769734 - /tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
Author: markt
Date: Wed Apr 29 10:22:00 2009
New Revision: 769734
URL: http://svn.apache.org/viewvc?rev=769734view=rev
Log:
Reduce scope - partial application of patch by Jens Kapitza from bug 46999
Modified:
tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java?rev=769734r1=769733r2=769734view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
Wed Apr 29 10:22:00 2009
@@ -32,7 +32,7 @@
*/
public class ThreadPoolExecutor extends
java.util.concurrent.ThreadPoolExecutor {
-final AtomicInteger activeCount = new AtomicInteger(0);
+private final AtomicInteger activeCount = new AtomicInteger(0);
public ThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long
keepAliveTime, TimeUnit unit, BlockingQueueRunnable workQueue,
RejectedExecutionHandler handler) {
super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue,
handler);
@@ -92,7 +92,7 @@
super.execute(command);
} catch (RejectedExecutionException rx) {
if (super.getQueue() instanceof TaskQueue) {
-TaskQueue queue = (TaskQueue)super.getQueue();
+final TaskQueue queue = (TaskQueue)super.getQueue();
try {
if (!queue.force(command, timeout, unit)) {
throw new RejectedExecutionException(Queue capacity
is full.);
@@ -108,7 +108,7 @@
}
}
-static class RejectHandler implements
java.util.concurrent.RejectedExecutionHandler {
+private static class RejectHandler implements
java.util.concurrent.RejectedExecutionHandler {
public void rejectedExecution(Runnable r,
java.util.concurrent.ThreadPoolExecutor executor) {
throw new RejectedExecutionException();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46999] change scope in ThreadPoolExecutor
https://issues.apache.org/bugzilla/show_bug.cgi?id=46999 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution||INVALID --- Comment #4 from Mark Thomas ma...@apache.org 2009-04-29 03:22:09 PST --- The patch is bad. It causes an exception to be thrown, even if forcing the task onto the queue was successful. I've applied the scope changes to trunk but they won't be ported to 6.0.x. -- 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: r769735 - in /tomcat/trunk/java/org/apache/catalina/loader: Reloader.java WebappClassLoader.java
Author: markt
Date: Wed Apr 29 10:24:57 2009
New Revision: 769735
URL: http://svn.apache.org/viewvc?rev=769735view=rev
Log:
Remove Reloader interface that is never used.
Removed:
tomcat/trunk/java/org/apache/catalina/loader/Reloader.java
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=769735r1=769734r2=769735view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Wed Apr
29 10:24:57 2009
@@ -105,7 +105,7 @@
*/
public class WebappClassLoader
extends URLClassLoader
-implements Reloader, Lifecycle
+implements Lifecycle
{
protected static org.apache.juli.logging.Log log=
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47116] New: Urgent, help: install problems tomcat 5.5 on x64 windows server 2008
https://issues.apache.org/bugzilla/show_bug.cgi?id=47116 Summary: Urgent, help: install problems tomcat 5.5 on x64 windows server 2008 Product: Tomcat 5 Version: 5.5.27 Platform: PC OS/Version: Windows Server 2008 (Longhorn) Status: NEW Keywords: FAQ Severity: blocker Priority: P1 Component: Native:Integration AssignedTo: dev@tomcat.apache.org ReportedBy: rdela...@ap400.nl CC: rdela...@ap400.nl Tried to install X64 version, but can't make/activate the tomcat service. Installing 32 but version give java version errors. I already installed the x64 version of Java. Due slowness of the old systeem we bought a faster x64 windows server 2008 machine and all other software is installed, only Tomcat isn't! Please let me know what actions/solution can be provided on short term. -- 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 47116] Urgent, help: install problems tomcat 5.5 on x64 windows server 2008
https://issues.apache.org/bugzilla/show_bug.cgi?id=47116 --- Comment #1 from Pid bugzi...@pidster.com 2009-04-29 05:21:40 PST --- Bugzilla is not a support forum. Read this: http://www.catb.org/~esr/faqs/smart-questions.html Then try again on the Tomcat Users mailing list. -- 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: r769760 - /tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
Author: markt
Date: Wed Apr 29 11:51:16 2009
New Revision: 769760
URL: http://svn.apache.org/viewvc?rev=769760view=rev
Log:
warp is long gone
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java?rev=769760r1=769759r2=769760view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
Wed Apr 29 11:51:16 2009
@@ -873,14 +873,6 @@
// Destroy the MBeans for each child Service
Service services[] = server.findServices();
for (int i = 0; i services.length; i++) {
-// FIXME - Warp object hierarchy not currently supported
-if (services[i].getContainer().getClass().getName().equals
-(org.apache.catalina.connector.warp.WarpEngine)) {
-if (log.isDebugEnabled()) {
-log.debug(Skipping MBean for Service + services[i]);
-}
-continue;
-}
destroyMBeans(services[i]);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47115] New: Urgent, help: install problems tomcat 5.5 on x64 windows server 2008
https://issues.apache.org/bugzilla/show_bug.cgi?id=47115 Summary: Urgent, help: install problems tomcat 5.5 on x64 windows server 2008 Product: Tomcat 5 Version: 5.5.27 Platform: PC OS/Version: Windows Server 2008 (Longhorn) Status: NEW Keywords: FAQ Severity: blocker Priority: P1 Component: Native:Integration AssignedTo: dev@tomcat.apache.org ReportedBy: rdela...@ap400.nl Tried to install X64 version, but can't make/activate the tomcat service. Installing 32 but version give java version errors. I already installed the x64 version of Java. Due slowness of the old systeem we bought a faster x64 windows server 2008 machine and all other software is installed, only Tomcat isn't! Please let me know what actions/solution can be provided on short term. -- 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 47115] Urgent, help: install problems tomcat 5.5 on x64 windows server 2008
https://issues.apache.org/bugzilla/show_bug.cgi?id=47115 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas ma...@apache.org 2009-04-29 05:33:29 PST --- This is a question for the users list. -- 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 47115] Urgent, help: install problems tomcat 5.5 on x64 windows server 2008
https://issues.apache.org/bugzilla/show_bug.cgi?id=47115 --- Comment #2 from Mark Thomas ma...@apache.org 2009-04-29 05:34:58 PST --- *** Bug 47116 has been marked as a duplicate of this bug. *** -- 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 47116] Urgent, help: install problems tomcat 5.5 on x64 windows server 2008
https://issues.apache.org/bugzilla/show_bug.cgi?id=47116 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Comment #2 from Mark Thomas ma...@apache.org 2009-04-29 05:34:58 PST --- *** This bug has been marked as a duplicate of bug 47115 *** -- 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 46538] ETag must differ between compressed and uncompressed resource versions
https://issues.apache.org/bugzilla/show_bug.cgi?id=46538 --- Comment #12 from Remy Maucherat r...@apache.org 2009-04-29 05:39:05 PST --- I think I used mostly IE when I tried it back then. Did you test with IE 7 and 8 ? I agree with this kind of browser support, it is still not doable to use T-E :( -- 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 46538] ETag must differ between compressed and uncompressed resource versions
https://issues.apache.org/bugzilla/show_bug.cgi?id=46538 --- Comment #13 from Mark Thomas ma...@apache.org 2009-04-29 06:01:47 PST --- IE7 and IE8 - no joy with T-E -- 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
Re: svn commit: r769734 - /tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
As I mentioned in the bug report, what is the benefit of this?
Filip
ma...@apache.org wrote:
Author: markt
Date: Wed Apr 29 10:22:00 2009
New Revision: 769734
URL: http://svn.apache.org/viewvc?rev=769734view=rev
Log:
Reduce scope - partial application of patch by Jens Kapitza from bug 46999
Modified:
tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java?rev=769734r1=769733r2=769734view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
Wed Apr 29 10:22:00 2009
@@ -32,7 +32,7 @@
*/
public class ThreadPoolExecutor extends
java.util.concurrent.ThreadPoolExecutor {
-final AtomicInteger activeCount = new AtomicInteger(0);
+private final AtomicInteger activeCount = new AtomicInteger(0);
public ThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueueRunnable workQueue, RejectedExecutionHandler handler) {
super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue,
handler);
@@ -92,7 +92,7 @@
super.execute(command);
} catch (RejectedExecutionException rx) {
if (super.getQueue() instanceof TaskQueue) {
-TaskQueue queue = (TaskQueue)super.getQueue();
+final TaskQueue queue = (TaskQueue)super.getQueue();
try {
if (!queue.force(command, timeout, unit)) {
throw new RejectedExecutionException(Queue capacity is
full.);
@@ -108,7 +108,7 @@
}
}
-static class RejectHandler implements java.util.concurrent.RejectedExecutionHandler {
+private static class RejectHandler implements
java.util.concurrent.RejectedExecutionHandler {
public void rejectedExecution(Runnable r,
java.util.concurrent.ThreadPoolExecutor executor) {
throw new RejectedExecutionException();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r769734 - /tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
Filip Hanik - Dev Lists wrote: As I mentioned in the bug report, what is the benefit of this? General best practise - no particular bug. Note the full proposed patch was bad. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46597] Not all cookie changes in 6.0.x branch have been ported to 5.5.x
https://issues.apache.org/bugzilla/show_bug.cgi?id=46597 --- Comment #8 from David Lewis dle...@pfc.cfs.nrcan.gc.ca 2009-04-29 09:38:37 PST --- Thanks! Is there an ETA for the 5.5.28 release? -- 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 46538] ETag must differ between compressed and uncompressed resource versions
https://issues.apache.org/bugzilla/show_bug.cgi?id=46538 --- Comment #14 from Remy Maucherat r...@apache.org 2009-04-29 10:16:59 PST --- Maybe something could be done when the client advertises the T-E, and drop to C-E if it does not ? -- 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: r769850 - /tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
Author: pero Date: Wed Apr 29 17:49:56 2009 New Revision: 769850 URL: http://svn.apache.org/viewvc?rev=769850view=rev Log: fix wrong package Modified: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java Modified: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java?rev=769850r1=769849r2=769850view=diff == --- tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java (original) +++ tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java Wed Apr 29 17:49:56 2009 @@ -35,7 +35,7 @@ import org.apache.catalina.cluster.ClusterManager; import org.apache.catalina.cluster.ClusterMessage; import org.apache.catalina.cluster.ClusterValve; -import org.apache.catalina.ha.session.DeltaSession; +import org.apache.catalina.cluster.session.DeltaSession; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.session.ManagerBase; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47121] New: mod_jk 1.2.27 produces JkWorkersFile only allowed once on Netware 6.5
https://issues.apache.org/bugzilla/show_bug.cgi?id=47121 Summary: mod_jk 1.2.27 produces JkWorkersFile only allowed once on Netware 6.5 Product: Tomcat Connectors Version: 1.2.27 Platform: PC OS/Version: other Status: NEW Severity: major Priority: P1 Component: mod_jk AssignedTo: dev@tomcat.apache.org ReportedBy: v...@hollebcons.com I have tried to install mod_jk 1.2.27 on Netware 6.5 per CVE-2008-5519: Apache Tomcat mod_jk information disclosure vulnerability. I downloaded the binary mod_jk-1.2.27-httpd-2.0.63-nw.zip http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/netware/jk-1.2.27/mod_jk-1.2.27-httpd-2.0.63-nw.zip from http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/netware/jk-1.2.27/ and tried to use it. Unfortunately I was getting the following in the httpd message screen: Syntax error on line 638 of SYS:/apache2/conf/httpd.conf: JkWorkersFile only allowed once Here is the part of the httpd.conf where the loader failed: Line 636 # TABLE: (4) Line 637 IfModule mod_jk.c Line 638 JkWorkersFile sys:/adminsrv/conf/mod_jk/workers.properties Line 639 JkLogFile logs/mod_jk.log Line 640 JkLogLevel error Line 641 /IfModule NetWare loads httpd in the Admin and then in the OS memory spaces. The problem is observed on the second load. Currently installed mod_jk ver. 1.2.23 works fine. -- 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: r769979 - in /tomcat/trunk/java/org/apache/catalina: connector/MapperListener.java mbeans/MBeanUtils.java mbeans/ServerLifecycleListener.java
Author: markt
Date: Wed Apr 29 22:47:53 2009
New Revision: 769979
URL: http://svn.apache.org/viewvc?rev=769979view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47046
Unregister all MBeans, including when non-default engine names are used (which
changes the domain of some of the MBeans)
Modified:
tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
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=769979r1=769978r2=769979view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java Wed Apr
29 22:47:53 2009
@@ -353,7 +353,9 @@
domain).getContainer().findChild(name);
mapper.removeHost(name);
-host.removeContainerListener(this);
+if (host != null) {
+host.removeContainerListener(this);
+}
if(log.isDebugEnabled())
log.debug(sm.getString
(mapperListener.unregisterHost, name, domain));
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java?rev=769979r1=769978r2=769979view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Wed Apr 29
22:47:53 2009
@@ -19,6 +19,7 @@
import java.util.Hashtable;
+import java.util.Set;
import javax.management.DynamicMBean;
import javax.management.MBeanException;
@@ -47,6 +48,12 @@
import org.apache.catalina.deploy.ContextResourceLink;
import org.apache.catalina.deploy.NamingResources;
import org.apache.catalina.valves.ValveBase;
+import org.apache.coyote.ProtocolHandler;
+import org.apache.coyote.ajp.AjpAprProtocol;
+import org.apache.coyote.ajp.AjpProtocol;
+import org.apache.coyote.http11.Http11AprProtocol;
+import org.apache.coyote.http11.Http11NioProtocol;
+import org.apache.coyote.http11.Http11Protocol;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.IntrospectionUtils;
@@ -734,29 +741,23 @@
throws MalformedObjectNameException {
ObjectName name = null;
-if (connector.getClass().getName().indexOf(CoyoteConnector) = 0 ) {
-try {
-String address = (String)
-IntrospectionUtils.getProperty(connector, address);
-Integer port = (Integer)
-IntrospectionUtils.getProperty(connector, port);
-StringBuffer sb = new StringBuffer(domain);
-sb.append(:type=Connector);
-sb.append(,port= + port);
-if ((address != null) (address.length()0)) {
-sb.append(,address= + address);
-}
-name = new ObjectName(sb.toString());
-return (name);
-} catch (Exception e) {
-throw new MalformedObjectNameException
-(Cannot create object name for + connector+e);
+try {
+String address = (String)
+IntrospectionUtils.getProperty(connector, address);
+Integer port = (Integer)
+IntrospectionUtils.getProperty(connector, port);
+StringBuffer sb = new StringBuffer(domain);
+sb.append(:type=Connector);
+sb.append(,port= + port);
+if ((address != null) (address.length()0)) {
+sb.append(,address= + address);
}
-} else {
+name = new ObjectName(sb.toString());
+return (name);
+} catch (Exception e) {
throw new MalformedObjectNameException
-(Cannot create object name for + connector);
+(Cannot create object name for + connector+e);
}
-
}
@@ -1373,13 +1374,8 @@
static void destroyMBean(Connector connector, Service service)
throws Exception {
-connector.setService(service);
-String mname = createManagedName(connector);
-ManagedBean managed = registry.findManagedBean(mname);
-if (managed == null) {
-return;
-}
-String domain = managed.getDomain();
+// domain is engine name
+String domain = service.getContainer().getName();
if (domain == null)
domain = mserver.getDefaultDomain();
Re: svn commit: r769850 - /tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
p...@apache.org wrote: Author: pero Date: Wed Apr 29 17:49:56 2009 New Revision: 769850 URL: http://svn.apache.org/viewvc?rev=769850view=rev Log: fix wrong package Thanks for catching that. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47046] Shutdown does not unregister all MBeans
https://issues.apache.org/bugzilla/show_bug.cgi?id=47046 --- Comment #1 from Mark Thomas ma...@apache.org 2009-04-29 16:32:48 PST --- This has been fixed in trunk and proposed for 6.0.x -- 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
Re: svn commit: r769734 - /tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
Mark Thomas wrote: Filip Hanik - Dev Lists wrote: As I mentioned in the bug report, what is the benefit of this? General best practise - no particular bug. Note the full proposed patch was bad. Bad practice would be to change an API, based on a report for general practice. It doesn't nothing but clutter the the SVN history for real bugs next time I will veto changes like this since what one considers best practice really merits to nothing, as it is a personal opinion and nothing technical. Filip 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
5.5.x release
I was thinking sometimes next week, how does that sound? Filip - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: 5.5.x release
On Wed, Apr 29, 2009 at 9:14 PM, Filip Hanik - Dev Lists devli...@hanik.com wrote: I was thinking sometimes next week, how does that sound? +1. Yoav - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
