JBossWeb SVN: r2037 - in branches/7.0.x: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2012-05-25 10:58:11 -0400 (Fri, 25 May 2012)
New Revision: 2037
Modified:
branches/7.0.x/java/org/apache/catalina/connector/CoyoteAdapter.java
branches/7.0.x/webapps/docs/changelog.xml
Log:
JBPAPP-9126: Set the context classloader as soon as possible on newly created threads
Modified: branches/7.0.x/java/org/apache/catalina/connector/CoyoteAdapter.java
===================================================================
--- branches/7.0.x/java/org/apache/catalina/connector/CoyoteAdapter.java 2012-05-16 13:29:25 UTC (rev 2036)
+++ branches/7.0.x/java/org/apache/catalina/connector/CoyoteAdapter.java 2012-05-25 14:58:11 UTC (rev 2037)
@@ -344,6 +344,9 @@
req.getParameters().setQueryStringEncoding
(connector.getURIEncoding());
+ // Set the context classloader, since in that case it might not be set
+ Thread.currentThread().setContextClassLoader(CoyoteAdapter.class.getClassLoader());
+
}
// Check if the connector was stopped
Modified: branches/7.0.x/webapps/docs/changelog.xml
===================================================================
--- branches/7.0.x/webapps/docs/changelog.xml 2012-05-16 13:29:25 UTC (rev 2036)
+++ branches/7.0.x/webapps/docs/changelog.xml 2012-05-25 14:58:11 UTC (rev 2037)
@@ -28,6 +28,10 @@
<fix>
Drop fix for <jboss-jira>AS7-4566</jboss-jira> (problem with IPv6 on shutdown on JDK 6). (remm)
</fix>
+ <fix>
+ <jboss-jira>JBPAPP-9126</jboss-jira>: Set the context classloader as soon as possible on newly
+ created threads. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
14 years
JBossWeb SVN: r2036 - branches/7.0.x/webapps/docs/config.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2012-05-16 09:29:25 -0400 (Wed, 16 May 2012)
New Revision: 2036
Modified:
branches/7.0.x/webapps/docs/config/native.xml
Log:
Tell where to add it.
Modified: branches/7.0.x/webapps/docs/config/native.xml
===================================================================
--- branches/7.0.x/webapps/docs/config/native.xml 2012-05-02 15:07:07 UTC (rev 2035)
+++ branches/7.0.x/webapps/docs/config/native.xml 2012-05-16 13:29:25 UTC (rev 2036)
@@ -57,7 +57,7 @@
Most of the tests tools are not realistic: they make the requests synchronously (and with no wait time) so the max number of
active threads could be reached quickly. Once it is reached the socket connections are closed.
In case you want the connector to wait for an available thread you can set org.apache.tomcat.util.net.Constants.WAIT_FOR_THREAD
- to true. For example in standalone.xml:
+ to true. For example in standalone.xml (after the </extensions>):
</p>
<source>
<system-properties>
14 years
JBossWeb SVN: r2035 - tags.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2012-05-02 11:07:07 -0400 (Wed, 02 May 2012)
New Revision: 2035
Added:
tags/JBOSSWEB_7_0_16_FINAL/
Log:
Web 7.0.16.
14 years, 1 month
JBossWeb SVN: r2034 - in branches/7.0.x: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2012-05-02 10:56:12 -0400 (Wed, 02 May 2012)
New Revision: 2034
Modified:
branches/7.0.x/java/org/apache/tomcat/util/net/JIoEndpoint.java
branches/7.0.x/webapps/docs/changelog.xml
Log:
Drop fix for AS7-4566 (problem with IPv6 on shutdown on JDK 6)
Modified: branches/7.0.x/java/org/apache/tomcat/util/net/JIoEndpoint.java
===================================================================
--- branches/7.0.x/java/org/apache/tomcat/util/net/JIoEndpoint.java 2012-04-26 16:23:56 UTC (rev 2033)
+++ branches/7.0.x/java/org/apache/tomcat/util/net/JIoEndpoint.java 2012-05-02 14:56:12 UTC (rev 2034)
@@ -1078,19 +1078,7 @@
if (address == null) {
s = new Socket("localhost", port);
} else {
- if (address instanceof Inet6Address && ((Inet6Address)address).isLinkLocalAddress()) {
- /* We need to work-around a java6 bug with IPv6 */
- String addressString = address.getHostAddress();
- if (addressString.indexOf("%") != -1) {
- String addressStringWithoutSuffix = addressString.substring(0, addressString.indexOf("%"));
- InetAddress addressWithoutSuffix = InetAddress.getByName(addressStringWithoutSuffix);
- s = new Socket (addressWithoutSuffix, port , addressWithoutSuffix, 0);
- } else {
- s = new Socket(address, port, address, 0);
- }
- } else {
- s = new Socket(address, port);
- }
+ s = new Socket(address, port);
// setting soLinger to a small value will help shutdown the
// connection quicker
s.setSoLinger(true, 0);
Modified: branches/7.0.x/webapps/docs/changelog.xml
===================================================================
--- branches/7.0.x/webapps/docs/changelog.xml 2012-04-26 16:23:56 UTC (rev 2033)
+++ branches/7.0.x/webapps/docs/changelog.xml 2012-05-02 14:56:12 UTC (rev 2034)
@@ -25,6 +25,9 @@
<fix>
<jboss-jira>AS7-4566</jboss-jira>: Add system property to configure connection timeout. (remm)
</fix>
+ <fix>
+ Drop fix for <jboss-jira>AS7-4566</jboss-jira> (problem with IPv6 on shutdown on JDK 6). (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
14 years, 1 month