Author: markt
Date: Tue Jul 30 09:13:40 2013
New Revision: 1508353
URL: http://svn.apache.org/r1508353
Log:
NIO endpoint should not be swallowing Virtual machine errors
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1508346
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1508353&r1=1508352&r2=1508353&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue
Jul 30 09:13:40 2013
@@ -1749,6 +1749,8 @@ public class NioEndpoint extends Abstrac
ExceptionUtils.handleThrowable(letsHopeWeDontGetHere);
}
}
+ } catch (VirtualMachineError vme) {
+ ExceptionUtils.handleThrowable(vme);
}catch ( Throwable t ) {
log.error("",t);
socket.getPoller().cancelledKey(key,SocketStatus.ERROR,false);
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1508353&r1=1508352&r2=1508353&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jul 30 09:13:40 2013
@@ -105,6 +105,10 @@
This prevents a long timeout delaying the closing of the socket
associated with a Comet connection after an error occurs. (markt)
</fix>
+ <fix>
+ Ensure that <code>java.lang.VirtualMachineError</code>s are not
+ swallowed when using the HTTP or AJP NIO connectors. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
