Author: markt
Date: Tue Jul 30 09:13:58 2013
New Revision: 1508354
URL: http://svn.apache.org/r1508354
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=1508354&r1=1508353&r2=1508354&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:13:58 2013
@@ -1577,13 +1577,13 @@ public class NioEndpoint extends Abstrac
status = SocketStatus.OPEN_READ;
}
}
- }catch ( IOException x ) {
+ } catch (IOException x) {
handshake = -1;
- if ( log.isDebugEnabled() ) log.debug("Error during SSL
handshake",x);
- }catch ( CancelledKeyException ckx ) {
+ if (log.isDebugEnabled()) log.debug("Error during SSL
handshake",x);
+ } catch (CancelledKeyException ckx) {
handshake = -1;
}
- if ( handshake == 0 ) {
+ if (handshake == 0) {
SocketState state = SocketState.OPEN;
// Process the request from this socket
if (status == null) {
@@ -1604,7 +1604,7 @@ public class NioEndpoint extends Abstrac
keyCache.push(ka);
}
ka = null;
- }catch ( Exception x ) {
+ } catch (Exception x) {
log.error("",x);
}
} else if (state == SocketState.LONG && ka != null &&
ka.isAsync() && ka.interestOps() > 0) {
@@ -1626,7 +1626,7 @@ public class NioEndpoint extends Abstrac
} else {
ka.getPoller().add(socket,handshake);
}
- } catch(CancelledKeyException cx) {
+ } catch (CancelledKeyException cx) {
socket.getPoller().cancelledKey(key, null);
} catch (OutOfMemoryError oom) {
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
