Author: markt Date: Wed Oct 2 11:12:38 2013 New Revision: 1528427 URL: http://svn.apache.org/r1528427 Log: Move comments as they are being associated with the wrong values.
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Poll.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1528407 Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Poll.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Poll.java?rev=1528427&r1=1528426&r2=1528427&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Poll.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Poll.java Wed Oct 2 11:12:38 2013 @@ -26,14 +26,20 @@ package org.apache.tomcat.jni; public class Poll { /** - * Poll options + * Poll return values */ - public static final int APR_POLLIN = 0x001; /** Can read without blocking */ - public static final int APR_POLLPRI = 0x002; /** Priority data available */ - public static final int APR_POLLOUT = 0x004; /** Can write without blocking */ - public static final int APR_POLLERR = 0x010; /** Pending error */ - public static final int APR_POLLHUP = 0x020; /** Hangup occurred */ - public static final int APR_POLLNVAL = 0x040; /** Descriptor invalid */ + /** Can read without blocking */ + public static final int APR_POLLIN = 0x001; + /** Priority data available */ + public static final int APR_POLLPRI = 0x002; + /** Can write without blocking */ + public static final int APR_POLLOUT = 0x004; + /** Pending error */ + public static final int APR_POLLERR = 0x010; + /** Hangup occurred */ + public static final int APR_POLLHUP = 0x020; + /** Descriptor invalid */ + public static final int APR_POLLNVAL = 0x040; /** * Pollset Flags Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1528427&r1=1528426&r2=1528427&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Oct 2 11:12:38 2013 @@ -91,6 +91,10 @@ Handle the case when a user closes the browser whilst playing the snake game in the JSR356 WebSocket examples. (markt) </fix> + <fix> + Ensure Javadoc comments are associated with the correct elements in + <code>org.apache.tomcat.jni.Poll</code>. (markt) + </fix> </changelog> </subsection> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org