You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2014/03/10 13:54:16 UTC
svn commit: r1575925 - in /tomcat/trunk/java/org/apache/tomcat/util/net:
Nio2Endpoint.java SecureNio2Channel.java
Author: kkolinko
Date: Mon Mar 10 12:54:16 2014
New Revision: 1575925
URL: http://svn.apache.org/r1575925
Log:
Checkstyle:
1. Trailing whitespace
2. Unused import
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1575925&r1=1575924&r2=1575925&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Mon Mar 10 12:54:16 2014
@@ -109,7 +109,7 @@ public class Nio2Endpoint extends Abstra
* Keep track of OOM warning messages.
*/
private long lastParachuteCheck = System.currentTimeMillis();
-
+
/**
* Cache for SocketProcessor objects
*/
@@ -265,7 +265,7 @@ public class Nio2Endpoint extends Abstra
}
// --------------------------------------------------------- Public Methods
-
+
/**
* Number of keepalive sockets.
*/
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1575925&r1=1575924&r2=1575925&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Mon Mar 10 12:54:16 2014
@@ -18,7 +18,6 @@ package org.apache.tomcat.util.net;
import java.io.EOFException;
import java.io.IOException;
-import java.net.SocketTimeoutException;
import java.nio.ByteBuffer;
import java.nio.channels.AsynchronousSocketChannel;
import java.nio.channels.ClosedChannelException;
@@ -295,7 +294,7 @@ public class SecureNio2Channel extends N
* This requires that both network and application buffers have been emptied out prior to this call taking place, or a
* IOException will be thrown.
* @throws IOException - if an IO exception occurs or if application or network buffers contain data
- * @throws SocketTimeoutException - if a socket operation timed out
+ * @throws java.net.SocketTimeoutException - if a socket operation timed out
*/
public void rehandshake() throws IOException {
//validate the network buffers are empty
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org