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 2012/03/14 16:00:23 UTC
svn commit: r1300578 - in /tomcat/trunk/java/org/apache:
catalina/websocket/WebSocketServlet.java tomcat/jni/socket/AprSocket.java
tomcat/jni/socket/AprSocketContext.java tomcat/spdy/SpdyConnection.java
Author: markt
Date: Wed Mar 14 15:00:22 2012
New Revision: 1300578
URL: http://svn.apache.org/viewvc?rev=1300578&view=rev
Log:
Fix Javadoc warnings
Modified:
tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java
tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java
Modified: tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1300578&r1=1300577&r2=1300578&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java Wed Mar 14 15:00:22 2012
@@ -215,7 +215,6 @@ public abstract class WebSocketServlet e
*
* @param subProtocol The sub-protocol agreed between the client and
* server or <code>null</code> if none was agreed
- * @return
*/
protected abstract StreamInbound createWebSocketInbound(String subProtocol);
}
Modified: tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java?rev=1300578&r1=1300577&r2=1300578&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java Wed Mar 14 15:00:22 2012
@@ -194,16 +194,14 @@ public class AprSocket implements Runnab
}
/**
- * Write.
- *
- * For both blocking and non-blocking, it'll return the number of bytes
- * written - it'll attempt to send as much as possible, but if the buffers
- * are full it'll return 0.
+ * Write as much data as possible to the socket.
*
* @param data
* @param off
* @param len
- * @return
+ * @return For both blocking and non-blocking, returns the number of bytes
+ * written. If no data can be written (e.g. if the buffers are
+ * full) 0 will be returned.
* @throws IOException
*/
public int write(byte[] data, int off, int len, long to) throws IOException {
Modified: tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java?rev=1300578&r1=1300577&r2=1300578&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java Wed Mar 14 15:00:22 2012
@@ -62,7 +62,7 @@ public class AprSocketContext {
/**
* Called in SSL mode after the handshake is completed.
*
- * @see AprSocketContext.customVerification()
+ * @see AprSocketContext#customVerification(TlsCertVerifier)
*/
public static interface TlsCertVerifier {
public void handshakeDone(AprSocket ch);
Modified: tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java?rev=1300578&r1=1300577&r2=1300578&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java Wed Mar 14 15:00:22 2012
@@ -557,7 +557,6 @@ public abstract class SpdyConnection { /
/**
* Process a SPDY connection. Called in a separate thread.
*
- * @return
* @throws IOException
*/
protected int handleFrame() throws IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org