DO NOT REPLY [Bug 49811] [PATCH] Disable UrlRewriting
https://issues.apache.org/bugzilla/show_bug.cgi?id=49811 Wesley changed: What|Removed |Added Summary|PATCH Custom attribute to |[PATCH] Disable |not encode sessions in URL |UrlRewriting -- 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
In cluster, when using DeltaManager memory leak can occur
Tested on apache-tomcat-6.0.29 running under jdk 1.6.0_18. When DeltaManager is instantiated and assigned in StandardContext.start(), is it done AFTER StandardContext.bindThreads(). DeltaManager, in turn, during initalization, asks for sessions in other nodes, and this may result in creating threads ThreadPoolExecutor in tribes. These threads created with contextClassLoader set to current webapplication WebAppClassLoader. This results in memory leak and error message during redeployment in tomcat log: 09/09/2010 14:46:19 S - - WebappClassLoader.clearReferencesThreads: The web application [/creditdev] appears to have started a thread named [pool-1-thread-1] but has failed to stop it. This is very likely to create a memory leak. Stacktrace: at java.util.concurrent.ThreadPoolExecutor.addThread(Unknown Source) at java.util.concurrent.ThreadPoolExecutor.addIfUnderCorePoolSize(Unknown Source) at java.util.concurrent.ThreadPoolExecutor.execute(Unknown Source) at org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor.addToQueue(MessageDispatch15Interceptor.java:67) at org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor.sendMessage(MessageDispatchInterceptor.java:68) at org.apache.catalina.tribes.group.ChannelInterceptorBase.sendMessage(ChannelInterceptorBase.java:75) at org.apache.catalina.tribes.group.interceptors.TcpFailureDetector.sendMessage(TcpFailureDetector.java:87) at org.apache.catalina.tribes.group.ChannelInterceptorBase.sendMessage(ChannelInterceptorBase.java:75) at org.apache.catalina.tribes.group.GroupChannel.send(GroupChannel.java:216) at org.apache.catalina.tribes.group.GroupChannel.send(GroupChannel.java:175) at org.apache.catalina.ha.tcp.SimpleTcpCluster.send(SimpleTcpCluster.java:813) at org.apache.catalina.ha.session.DeltaManager.getAllClusterSessions(DeltaManager.java:959) at org.apache.catalina.ha.session.DeltaManager.start(DeltaManager.java:930) at org.apache.catalina.core.ContainerBase.setManager(ContainerBase.java:438) at org.apache.catalina.core.StandardContext.start(StandardContext.java:4559) at org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:791) at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:771) at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:546) at org.apache.catalina.startup.HostConfig.deployDescriptor(HostConfig.java:637) at org.apache.catalina.startup.HostConfig.deployDescriptors(HostConfig.java:563) at org.apache.catalina.startup.HostConfig.deployApps(HostConfig.java:498) at org.apache.catalina.startup.HostConfig.start(HostConfig.java:1277) at org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.java:321) at org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119) at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1053) at org.apache.catalina.core.StandardHost.start(StandardHost.java:785) at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1045) at org.apache.catalina.core.StandardEngine.start(StandardEngine.java:445) at org.apache.catalina.core.StandardService.start(StandardService.java:519) at org.apache.catalina.core.StandardServer.start(StandardServer.java:710) at org.apache.catalina.startup.Catalina.start(Catalina.java:581) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) at java.lang.reflect.Method.invoke(Unknown Source) at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:289) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:414) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) at java.lang.reflect.Method.invoke(Unknown Source) at org.tanukisoftware.wrapper.WrapperStartStopApp.run(WrapperStartStopApp.java:243) at java.lang.Thread.run(Unknown Source) Proposed solution - implement java.util.concurrent.ThreadFactory in MessageDispatch15Interceptor and pass instance on ThreadPoolExecutor executor creation. This instance must call setContextClassLoader(null) in newThread() overriden method. With kindest personal regards, Ruslan Gainutdinov - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: In cluster, when using DeltaManager memory leak can occur
> Proposed solution - implement java.util.concurrent.ThreadFactory in > MessageDispatch15Interceptor > and pass instance on ThreadPoolExecutor executor creation. I`ve created patch for proposed solution. http://huksley.sdot.ru/wp-content/uploads/2010/09/tomcat-fix-memory-leak-deltamanager.zip With kindest personal regards, Ruslan Gainutdinov - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: In cluster, when using DeltaManager memory leak can occur
On 09/09/2010 12:11, Ruslan Gainutdinov wrote: >> Proposed solution - implement java.util.concurrent.ThreadFactory in >> MessageDispatch15Interceptor >> and pass instance on ThreadPoolExecutor executor creation. > > I`ve created patch for proposed solution. > http://huksley.sdot.ru/wp-content/uploads/2010/09/tomcat-fix-memory-leak-deltamanager.zip Great. Please create a Bugzilla entry for this issue so it doesn't get lost. Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49905] New: In cluster, when using DeltaManager memory leak can occur
https://issues.apache.org/bugzilla/show_bug.cgi?id=49905 Summary: In cluster, when using DeltaManager memory leak can occur Product: Tomcat 6 Version: 6.0.29 Platform: PC OS/Version: Windows Server 2003 Status: NEW Severity: normal Priority: P2 Component: Cluster AssignedTo: dev@tomcat.apache.org ReportedBy: cont...@ruslan.org Created an attachment (id=26008) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26008) Patch to remove context classloader from threads in ThreadPoolExecutor in tribes Tested on apache-tomcat-6.0.29 running under jdk 1.6.0_18. When DeltaManager is instantiated and assigned in StandardContext.start(), is it done AFTER StandardContext.bindThreads(). DeltaManager, in turn, during initalization, asks for sessions in other nodes, and this may result in creating threads in ThreadPoolExecutor in tribes. These threads created with contextClassLoader set to current webapplication WebAppClassLoader. This results in memory leak and error message during redeployment in tomcat log: 09/09/2010 14:46:19 S - - WebappClassLoader.clearReferencesThreads: The web application [/creditdev] appears to have started a thread named [pool-1-thread-1] but has failed to stop it. This is very likely to create a memory leak. Stacktrace: at java.util.concurrent.ThreadPoolExecutor.addThread(Unknown Source) at java.util.concurrent.ThreadPoolExecutor.addIfUnderCorePoolSize(Unknown Source) at java.util.concurrent.ThreadPoolExecutor.execute(Unknown Source) at org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor.addToQueue(MessageDispatch15Interceptor.java:67) at org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor.sendMessage(MessageDispatchInterceptor.java:68) at org.apache.catalina.tribes.group.ChannelInterceptorBase.sendMessage(ChannelInterceptorBase.java:75) at org.apache.catalina.tribes.group.interceptors.TcpFailureDetector.sendMessage(TcpFailureDetector.java:87) at org.apache.catalina.tribes.group.ChannelInterceptorBase.sendMessage(ChannelInterceptorBase.java:75) at org.apache.catalina.tribes.group.GroupChannel.send(GroupChannel.java:216) at org.apache.catalina.tribes.group.GroupChannel.send(GroupChannel.java:175) at org.apache.catalina.ha.tcp.SimpleTcpCluster.send(SimpleTcpCluster.java:813) at org.apache.catalina.ha.session.DeltaManager.getAllClusterSessions(DeltaManager.java:959) at org.apache.catalina.ha.session.DeltaManager.start(DeltaManager.java:930) at org.apache.catalina.core.ContainerBase.setManager(ContainerBase.java:438) at org.apache.catalina.core.StandardContext.start(StandardContext.java:4559) at org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:791) at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:771) at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:546) at org.apache.catalina.startup.HostConfig.deployDescriptor(HostConfig.java:637) at org.apache.catalina.startup.HostConfig.deployDescriptors(HostConfig.java:563) at org.apache.catalina.startup.HostConfig.deployApps(HostConfig.java:498) at org.apache.catalina.startup.HostConfig.start(HostConfig.java:1277) at org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.java:321) at org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119) at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1053) at org.apache.catalina.core.StandardHost.start(StandardHost.java:785) at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1045) at org.apache.catalina.core.StandardEngine.start(StandardEngine.java:445) at org.apache.catalina.core.StandardService.start(StandardService.java:519) at org.apache.catalina.core.StandardServer.start(StandardServer.java:710) at org.apache.catalina.startup.Catalina.start(Catalina.java:581) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) at java.lang.reflect.Method.invoke(Unknown Source) at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:289) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:414) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) at java.lang.reflect.Method.invoke(Unknown Source) at org.tanukisoftware.wrapper.WrapperStartStopApp.run(WrapperStartStopApp.java:243) at java.lang.Thread.run(Unknown Source) Propo
Re: [VOTE] Release Tomcat 5.5.31 Build
On Sep 8, 2010, at 12:02 PM, sebb wrote: > > There are some non-trivial souce files without AL headers: > > build/build.properties.default > build/resources/welcome.bin.html > > These ones also don't have AL headers, but perhaps comments are not allowed: > > build/resources/config.ini > build/resources/jvm.ini > Not a regression from what I can see... > Some of the files in the SVN tag disagree with the source archive: > > build/build.properties.default > build/build.xml > > Files in source archive but not found in SVN: > > build.xml > build/tomcat-5.5.31-build.txt This is expected, since the tag was not updated due to some build issues. It was agreed to reroll the package (to include some classes) but not retag. The change to build.xml was required for that. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r995432 - /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Author: markt
Date: Thu Sep 9 14:01:50 2010
New Revision: 995432
URL: http://svn.apache.org/viewvc?rev=995432&view=rev
Log:
Trim whitespace from interceptor class names, property names and property
values.
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=995432&r1=995431&r2=995432&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Thu Sep 9 14:01:50 2010
@@ -403,16 +403,16 @@ public class PoolProperties implements P
int propIndex = interceptorValues[i].indexOf("(");
int endIndex = interceptorValues[i].indexOf(")");
if (propIndex<0 || endIndex<0 || endIndex <= propIndex) {
-definitions[i] = new
InterceptorDefinition(interceptorValues[i]);
+definitions[i] = new
InterceptorDefinition(interceptorValues[i].trim());
} else {
-String name =
interceptorValues[i].substring(0,propIndex);
+String name =
interceptorValues[i].substring(0,propIndex).trim();
definitions[i] = new InterceptorDefinition(name);
String propsAsString =
interceptorValues[i].substring(propIndex+1, interceptorValues[i].length()-1);
String[] props = propsAsString.split(",");
for (int j=0; j
svn commit: r995433 - /tomcat/trunk/modules/jdbc-pool/doc/changelog.xml
Author: markt Date: Thu Sep 9 14:03:12 2010 New Revision: 995433 URL: http://svn.apache.org/viewvc?rev=995433&view=rev Log: Update change log Modified: tomcat/trunk/modules/jdbc-pool/doc/changelog.xml Modified: tomcat/trunk/modules/jdbc-pool/doc/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/changelog.xml?rev=995433&r1=995432&r2=995433&view=diff == --- tomcat/trunk/modules/jdbc-pool/doc/changelog.xml (original) +++ tomcat/trunk/modules/jdbc-pool/doc/changelog.xml Thu Sep 9 14:03:12 2010 @@ -31,6 +31,9 @@ + 995432 Make interceptor class names, property names + and property values tolerant of whitespace by trimming the values before + use. (markt) 995091 49831 Make sure pooled XAConnections are closed when the connection pool shuts down. Patch provided by Daniel Mikusa. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49234] JMX Descriptor Modifications
https://issues.apache.org/bugzilla/show_bug.cgi?id=49234 --- Comment #90 from chamith buddhika 2010-09-09 11:01:50 EDT --- (In reply to comment #89) > Created an attachment (id=25937) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25937) [details] > o.a.Catalina.core Operations Patch 6 > > This iteration of the patch adds a ServiceMBean to enhance Service related > functionalities. AddConnector and related methods are now properly available > in > Service MBean. Includes several other modifications for the earlier patch like > removal of startChild method in ContainerMBean and initializing the children > during addChild. With this patch I am able to do following successfully. 1. Create a Service and Engine 2. Create and add a connector to the service 3. Initialize the service, engine and connectors 3. Create a Host and Context and initialize them It is not clear what sequence of next steps to be taken to add and serve a resource after this. Any ideas on how to proceed? -- 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 47678] Unable to allocate shared memory when using isapi_redirect.dll as an extension and filter
https://issues.apache.org/bugzilla/show_bug.cgi?id=47678 --- Comment #3 from Eric Smith 2010-09-09 12:11:19 EDT --- I've created a patch that seems to work. The problem seems to arise from IIS 7 having more rigorous security, in particular the default ACLs are now restricted when create mappings and mutexes. The changes to jk_shm.c are to (1) add a SECURITY_ATTRIBUTES structure having KEY_ALL_ACCESS (I granted to Everyone (SECURITY_WORLD_RID) in test, but this should probably be more restricted) as the 2nd argument in the CreateFileMapping call and (2) add a SECURITY_ATTRIBUTES structure having MUTEX_ALL_ACCESS as the 1st argument in the CreateMutex call. [Thu Sep 09 12:06:06.862 2010] [4920:2456] [info] init_jk::jk_isapi_plugin.c (2403): Starting Jakarta/ISAPI/isapi_redirector/1.2.31 [Thu Sep 09 12:06:06.878 2010] [4920:2456] [info] jk_shm_open::jk_shm.c (174): About to map JKISAPISHMEM_LOCALHOST_1 size 640 [Thu Sep 09 12:06:06.878 2010] [4920:2456] [info] jk_shm_open::jk_shm.c (182): CreateFileMapping returned: 0 [Thu Sep 09 12:06:06.878 2010] [4920:2456] [info] jk_shm_open::jk_shm.c (197): mutex name: Global\JKISAPISHMEM_LOCALHOST_1_MUTEX [Thu Sep 09 12:06:06.878 2010] [4920:2456] [info] jk_shm_open::jk_shm.c (207): CreateMutex returned: 0 [Thu Sep 09 12:06:06.878 2010] [4920:2456] [info] jk_shm_open::jk_shm.c (209): jk_shm_hlock: 668 [Thu Sep 09 12:06:06.893 2010] [4920:2456] [info] init_jk::jk_isapi_plugin.c (2573): Jakarta/ISAPI/isapi_redirector/1.2.31 initialized [Thu Sep 09 12:06:08.768 2010] [4388:3792] [info] init_jk::jk_isapi_plugin.c (2403): Starting Jakarta/ISAPI/isapi_redirector/1.2.31 [Thu Sep 09 12:06:08.768 2010] [4388:3792] [info] jk_shm_open::jk_shm.c (174): About to map JKISAPISHMEM_LOCALHOST_1 size 640 [Thu Sep 09 12:06:08.768 2010] [4388:3792] [info] jk_shm_open::jk_shm.c (182): CreateFileMapping returned: 183 [Thu Sep 09 12:06:08.784 2010] [4388:3792] [info] jk_shm_open::jk_shm.c (184): Attached, map: 660 [Thu Sep 09 12:06:08.784 2010] [4388:3792] [info] jk_shm_open::jk_shm.c (197): mutex name: Global\JKISAPISHMEM_LOCALHOST_1_MUTEX [Thu Sep 09 12:06:08.784 2010] [4388:3792] [info] jk_shm_open::jk_shm.c (201): OpenMutex returned: 183 [Thu Sep 09 12:06:08.784 2010] [4388:3792] [info] jk_shm_open::jk_shm.c (209): jk_shm_hlock: 664 [Thu Sep 09 12:06:08.800 2010] [4388:3792] [info] init_jk::jk_isapi_plugin.c (2573): Jakarta/ISAPI/isapi_redirector/1.2.31 initialized -- 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 49811] [PATCH] Disable UrlRewriting
https://issues.apache.org/bugzilla/show_bug.cgi?id=49811 --- Comment #9 from Wesley 2010-09-09 13:57:54 EDT --- >It was a good initiative and I'm sure we will have a look at the patch. Please >be patient though. If you don't see any progress (comments in the Bugzilla >issue), then it is fine to nag after about one or two weeks. Em: Nag. Seriously though I'm not 100% happy with this but there didn't seem to be a cheap way of getting the context reference at the point of URL parsing. Delaying the url parsing had side effects (for contexts which didn't disable urlRewriting). So does this seem like a reasonable way to do it? -- 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: r995572 - /tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
Author: markt
Date: Thu Sep 9 20:34:27 2010
New Revision: 995572
URL: http://svn.apache.org/viewvc?rev=995572&view=rev
Log:
Shorten the debug output
Modified:
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=995572&r1=995571&r2=995572&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Thu Sep 9
20:34:27 2010
@@ -459,12 +459,10 @@ public class AsyncContextImpl implements
threadName = threadName.substring(len - 20, len);
}
String msg = String.format(
-"Request: %1$8s CoyoteRequest: %2$8s " +
-"RequestProcessor: %3$8s Stage: %4$s Thread: %5$20s " +
-"State: %6$20s Method: %7$11s URI: %8$s",
-rHashCode, crHashCode,
-rpHashCode, stage, Thread.currentThread().getName(),
-state, method, uri);
+"Req: %1$8s CReq: %2$8s RP: %3$8s Stage: %4$s " +
+"Thread: %5$20s State: %6$20s Method: %7$11s URI: %8$s",
+rHashCode, crHashCode, rpHashCode, stage,
+Thread.currentThread().getName(), state, method, uri);
if (log.isTraceEnabled()) {
log.trace(msg, new DebugException());
} else {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r995576 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AbstractEndpoint.java AprEndpoint.java JIoEndpoint.java NioEndpoint.java
Author: markt
Date: Thu Sep 9 21:07:37 2010
New Revision: 995576
URL: http://svn.apache.org/viewvc?rev=995576&view=rev
Log:
Refactor log messages to use logger from concrete class
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=995576&r1=995575&r2=995576&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu Sep
9 21:07:37 2010
@@ -42,7 +42,6 @@ import org.apache.tomcat.util.threads.Th
* @author Remy Maucherat
*/
public abstract class AbstractEndpoint {
-private static final Log log = LogFactory.getLog(AbstractEndpoint.class);
// -- Constants
protected static final StringManager sm =
StringManager.getManager("org.apache.tomcat.util.net.res");
@@ -318,7 +317,7 @@ public abstract class AbstractEndpoint {
return IntrospectionUtils.setProperty(this,name,value,false);
}
}catch ( Exception x ) {
-log.error("Unable to set attribute \""+name+"\" to
\""+value+"\"",x);
+getLog().error("Unable to set attribute \""+name+"\" to
\""+value+"\"",x);
return false;
}
}
@@ -408,16 +407,16 @@ public abstract class AbstractEndpoint {
s.setSoTimeout(getSocketProperties().getSoTimeout());
// TODO Consider hard-coding to s.setSoLinger(true,0)
s.setSoLinger(getSocketProperties().getSoLingerOn(),getSocketProperties().getSoLingerTime());
-if (log.isDebugEnabled()) {
-log.debug("About to unlock socket for:"+saddr);
+if (getLog().isDebugEnabled()) {
+getLog().debug("About to unlock socket for:"+saddr);
}
s.connect(saddr,getSocketProperties().getUnlockTimeout());
-if (log.isDebugEnabled()) {
-log.debug("Socket unlock completed for:"+saddr);
+if (getLog().isDebugEnabled()) {
+getLog().debug("Socket unlock completed for:"+saddr);
}
} catch(Exception e) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("endpoint.debug.unlock", "" +
getPort()), e);
+if (getLog().isDebugEnabled()) {
+getLog().debug(sm.getString("endpoint.debug.unlock", "" +
getPort()), e);
}
} finally {
if (s != null) {
@@ -470,7 +469,7 @@ public abstract class AbstractEndpoint {
f = new File(path);
}
if (!f.exists()) {
-log.warn("configured file:["+path+"] does not exist.");
+getLog().warn("configured file:["+path+"] does not exist.");
}
return path;
}
@@ -480,6 +479,8 @@ public abstract class AbstractEndpoint {
return val;
}
+protected abstract Log getLog();
+
// SSL related properties
private String algorithm = KeyManagerFactory.getDefaultAlgorithm();
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=995576&r1=995575&r2=995576&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu Sep 9
21:07:37 2010
@@ -887,6 +887,11 @@ public class AprEndpoint extends Abstrac
}
}
+@Override
+protected Log getLog() {
+return log;
+}
+
// --- Acceptor Inner Class
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=995576&r1=995575&r2=995576&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Thu Sep 9
21:07:37 2010
@@ -538,6 +538,11 @@ public class JIoEndpoint extends Abstrac
protected ConcurrentLinkedQueue> waitingRequests =
new ConcurrentLinkedQueue>();
+@Override
+protected Log getLog() {
+return log;
+}
+
private static class Privil
svn commit: r995577 - /tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
Author: markt
Date: Thu Sep 9 21:08:50 2010
New Revision: 995577
URL: http://svn.apache.org/viewvc?rev=995577&view=rev
Log:
Code clean up
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=995577&r1=995576&r2=995577&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu Sep
9 21:08:50 2010
@@ -27,7 +27,6 @@ import javax.net.ssl.KeyManagerFactory;
import org.apache.catalina.Globals;
import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.net.jsse.JSSESocketFactory;
import org.apache.tomcat.util.res.StringManager;
@@ -600,11 +599,9 @@ public abstract class AbstractEndpoint {
}
-private String sslEnabledProtocols=null; //"TLSv1,SSLv3,SSLv2Hello"
private String[] sslEnabledProtocolsarr = new String[0];
public String[] getSslEnabledProtocolsArray() { return
this.sslEnabledProtocolsarr;}
public void setSslEnabledProtocols(String s) {
-this.sslEnabledProtocols = s;
StringTokenizer t = new StringTokenizer(s,",");
sslEnabledProtocolsarr = new String[t.countTokens()];
for (int i=0; i
[Tomcat Wiki] Update of "SSLWithFORMFallback" by Richar dUnger
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "SSLWithFORMFallback" page has been changed by RichardUnger. http://wiki.apache.org/tomcat/SSLWithFORMFallback?action=diff&rev1=12&rev2=13 -- See also: - * [[SSLWithFormFallback6]] + * [[SSLWithFORMFallback6]] * [[SSLWithFormFallbackAuthenticator]] SSL Client Authentication (sometimes also known as "Client Certificate" authentication) uses the SSL protocol to authenticate clients based on a X509 Certificate. Normally this is accomplished by configuring SSL in Tomcat, and then configuring the Web Application's security descriptor to use "CLIENT-CERT" as the auth-method in the login-config section. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49900] BundleSupport.release() does not call super.release() to clear bodyContent
https://issues.apache.org/bugzilla/show_bug.cgi?id=49900 --- Comment #1 from Jeremy Boynes 2010-09-10 01:44:03 EDT --- Sounds plausible. If you add the call to super.release() does the memory usage improve? -- 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
