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 2013/07/30 11:06:27 UTC
svn commit: r1508348 -
/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Author: markt
Date: Tue Jul 30 09:06:27 2013
New Revision: 1508348
URL: http://svn.apache.org/r1508348
Log:
Make formatting more consistent
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1508348&r1=1508347&r2=1508348&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue Jul 30 09:06:27 2013
@@ -1626,8 +1626,8 @@ public class NioEndpoint extends Abstrac
} else {
ka.getPoller().add(socket,handshake);
}
- }catch(CancelledKeyException cx) {
- socket.getPoller().cancelledKey(key,null);
+ } catch(CancelledKeyException cx) {
+ socket.getPoller().cancelledKey(key, null);
} catch (OutOfMemoryError oom) {
try {
oomParachuteData = null;
@@ -1636,18 +1636,18 @@ public class NioEndpoint extends Abstrac
socket.getPoller().cancelledKey(key,SocketStatus.ERROR);
}
releaseCaches();
- }catch ( Throwable oomt ) {
+ } catch (Throwable oomt) {
try {
System.err.println(oomParachuteMsg);
oomt.printStackTrace();
- }catch (Throwable letsHopeWeDontGetHere){
+ } catch (Throwable letsHopeWeDontGetHere){
ExceptionUtils.handleThrowable(letsHopeWeDontGetHere);
}
}
} catch (VirtualMachineError vme) {
ExceptionUtils.handleThrowable(vme);
- }catch ( Throwable t ) {
- log.error("",t);
+ } catch (Throwable t) {
+ log.error("", t);
if (socket != null) {
socket.getPoller().cancelledKey(key,SocketStatus.ERROR);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org