Author: kkolinko Date: Sun Oct 19 17:42:17 2014 New Revision: 1632959 URL: http://svn.apache.org/r1632959 Log: Merged r1631987 r1631993 from tomcat/trunk: Java 8 isn't complaining about these but Eclipse is so fix them as well
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/javax/websocket/RemoteEndpoint.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1631987,1631993 Modified: tomcat/tc7.0.x/trunk/java/javax/websocket/RemoteEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/websocket/RemoteEndpoint.java?rev=1632959&r1=1632958&r2=1632959&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/javax/websocket/RemoteEndpoint.java (original) +++ tomcat/tc7.0.x/trunk/java/javax/websocket/RemoteEndpoint.java Sun Oct 19 17:42:17 2014 @@ -173,6 +173,8 @@ public interface RemoteEndpoint { * @param applicationData The payload for the ping message * * @throws IOException If an I/O error occurs while sending the ping + * @throws IllegalArgumentException if the applicationData is too large for + * a control message (max 125 bytes) */ void sendPing(ByteBuffer applicationData) throws IOException, IllegalArgumentException; @@ -185,6 +187,8 @@ public interface RemoteEndpoint { * @param applicationData The payload for the pong message * * @throws IOException If an I/O error occurs while sending the pong + * @throws IllegalArgumentException if the applicationData is too large for + * a control message (max 125 bytes) */ void sendPong(ByteBuffer applicationData) throws IOException, IllegalArgumentException; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org