Author: markt
Date: Tue Mar 6 21:26:11 2012
New Revision: 1297729
URL: http://svn.apache.org/viewvc?rev=1297729&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=52729
Even if the end event fails, try and perform the close.
Modified:
tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
Modified:
tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java?rev=1297729&r1=1297728&r2=1297729&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
Tue Mar 6 21:26:11 2012
@@ -126,17 +126,23 @@ public class CometConnectionManagerValve
session.removeAttribute(cometRequestsAttribute);
}
// Close the comet connection
+ CometEventImpl cometEvent = request.getEvent();
try {
- CometEventImpl cometEvent = request.getEvent();
cometEvent.setEventType(CometEvent.EventType.END);
cometEvent.setEventSubType(
CometEvent.EventSubType.WEBAPP_RELOAD);
getNext().event(request, request.getResponse(),
cometEvent);
- cometEvent.close();
} catch (Exception e) {
container.getLogger().warn(
sm.getString("cometConnectionManagerValve.event"),
e);
+ } finally {
+ try {
+ cometEvent.close();
+ } catch (IOException e) {
+ container.getLogger().warn(sm.getString(
+ "cometConnectionManagerValve.event"), e);
+ }
}
}
cometRequests.clear();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
