You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/09/20 19:05:08 UTC
svn commit: r1173251 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/coyote/http11/Http11AprProtocol.java
Author: markt
Date: Tue Sep 20 17:05:08 2011
New Revision: 1173251
URL: http://svn.apache.org/viewvc?rev=1173251&view=rev
Log:
Don't add to Poller when socket is closing to prevent NPEs.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 20 17:05:08 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1173020-1173021,1173082,1173096
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173096
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1173251&r1=1173250&r2=1173251&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Tue Sep 20 17:05:08 2011
@@ -215,7 +215,7 @@ public class Http11AprProtocol extends A
boolean addToPoller) {
processor.recycle();
recycledProcessors.offer(processor);
- if (addToPoller) {
+ if (addToPoller && proto.endpoint.isRunning()) {
((AprEndpoint)proto.endpoint).getPoller().add(
socket.getSocket().longValue(), true);
}
@@ -234,7 +234,7 @@ public class Http11AprProtocol extends A
if (processor.isAsync()) {
socket.setAsync(true);
- } else if (processor.comet) {
+ } else if (processor.comet && proto.endpoint.isRunning()) {
((AprEndpoint) proto.endpoint).getCometPoller().add(
socket.getSocket().longValue(), false);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1173251 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/Http11AprProtocol.java
Posted by Mark Thomas <ma...@apache.org>.
On 26/09/2011 13:46, Mark Thomas wrote:
> On 26/09/2011 08:00, Konstantin Kolinko wrote:
>> 2011/9/20 <ma...@apache.org>:
>>> Author: markt
>>> Date: Tue Sep 20 17:05:08 2011
>>> New Revision: 1173251
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1173251&view=rev
>>> Log:
>>> Don't add to Poller when socket is closing to prevent NPEs.
>>>
>>> Modified:
>>> tomcat/tc7.0.x/trunk/ (props changed)
>>> tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
>>>
>>
>>> Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
>>> URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1173251&r1=1173250&r2=1173251&view=diff
>>> ==============================================================================
>>> --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
>>> +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Tue Sep 20 17:05:08 2011
>>> @@ -215,7 +215,7 @@ public class Http11AprProtocol extends A
>>> boolean addToPoller) {
>>> processor.recycle();
>>> recycledProcessors.offer(processor);
>>> - if (addToPoller) {
>>> + if (addToPoller && proto.endpoint.isRunning()) {
>>> ((AprEndpoint)proto.endpoint).getPoller().add(
>>> socket.getSocket().longValue(), true);
>>> }
>>> @@ -234,7 +234,7 @@ public class Http11AprProtocol extends A
>>>
>>> if (processor.isAsync()) {
>>> socket.setAsync(true);
>>> - } else if (processor.comet) {
>>> + } else if (processor.comet && proto.endpoint.isRunning()) {
>>> ((AprEndpoint) proto.endpoint).getCometPoller().add(
>>> socket.getSocket().longValue(), false);
>>> }
>>
>> If the socket is not added to the poller, shouldn't it be closed instead?
>
> Fair point. I'll take a look. I suspect I was trying to avoid closing
> the socket twice as that causes other problems.
Yep that was it. The socket will get closed when the endpoint is
stopped/destroyed (depending on bindOnInit).
Looking at the code in more detail I think there is probably a case for
a more careful review of this code and possibly some re-factoring so
stopping a connector is cleaner. Given the amount of time that this
might take, I don't plan to start that now but I'll add it to the Tomcat
8 todo list.
As an aside, I still see the odd Comet failure with NIO which may be
related to this.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1173251 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/Http11AprProtocol.java
Posted by Mark Thomas <ma...@apache.org>.
On 26/09/2011 08:00, Konstantin Kolinko wrote:
> 2011/9/20 <ma...@apache.org>:
>> Author: markt
>> Date: Tue Sep 20 17:05:08 2011
>> New Revision: 1173251
>>
>> URL: http://svn.apache.org/viewvc?rev=1173251&view=rev
>> Log:
>> Don't add to Poller when socket is closing to prevent NPEs.
>>
>> Modified:
>> tomcat/tc7.0.x/trunk/ (props changed)
>> tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
>>
>
>> Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
>> URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1173251&r1=1173250&r2=1173251&view=diff
>> ==============================================================================
>> --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
>> +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Tue Sep 20 17:05:08 2011
>> @@ -215,7 +215,7 @@ public class Http11AprProtocol extends A
>> boolean addToPoller) {
>> processor.recycle();
>> recycledProcessors.offer(processor);
>> - if (addToPoller) {
>> + if (addToPoller && proto.endpoint.isRunning()) {
>> ((AprEndpoint)proto.endpoint).getPoller().add(
>> socket.getSocket().longValue(), true);
>> }
>> @@ -234,7 +234,7 @@ public class Http11AprProtocol extends A
>>
>> if (processor.isAsync()) {
>> socket.setAsync(true);
>> - } else if (processor.comet) {
>> + } else if (processor.comet && proto.endpoint.isRunning()) {
>> ((AprEndpoint) proto.endpoint).getCometPoller().add(
>> socket.getSocket().longValue(), false);
>> }
>
> If the socket is not added to the poller, shouldn't it be closed instead?
Fair point. I'll take a look. I suspect I was trying to avoid closing
the socket twice as that causes other problems.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1173251 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/Http11AprProtocol.java
Posted by Konstantin Kolinko <kn...@gmail.com>.
2011/9/20 <ma...@apache.org>:
> Author: markt
> Date: Tue Sep 20 17:05:08 2011
> New Revision: 1173251
>
> URL: http://svn.apache.org/viewvc?rev=1173251&view=rev
> Log:
> Don't add to Poller when socket is closing to prevent NPEs.
>
> Modified:
> tomcat/tc7.0.x/trunk/ (props changed)
> tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
>
> Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
> URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1173251&r1=1173250&r2=1173251&view=diff
> ==============================================================================
> --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
> +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Tue Sep 20 17:05:08 2011
> @@ -215,7 +215,7 @@ public class Http11AprProtocol extends A
> boolean addToPoller) {
> processor.recycle();
> recycledProcessors.offer(processor);
> - if (addToPoller) {
> + if (addToPoller && proto.endpoint.isRunning()) {
> ((AprEndpoint)proto.endpoint).getPoller().add(
> socket.getSocket().longValue(), true);
> }
> @@ -234,7 +234,7 @@ public class Http11AprProtocol extends A
>
> if (processor.isAsync()) {
> socket.setAsync(true);
> - } else if (processor.comet) {
> + } else if (processor.comet && proto.endpoint.isRunning()) {
> ((AprEndpoint) proto.endpoint).getCometPoller().add(
> socket.getSocket().longValue(), false);
> }
If the socket is not added to the poller, shouldn't it be closed instead?
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org