Author: markt
Date: Mon Oct 13 15:06:59 2014
New Revision: 1631434
URL: http://svn.apache.org/r1631434
Log:
Fix Java 8 Javadoc errors in org.apache.tomcat.jni
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/File.java
tomcat/trunk/java/org/apache/tomcat/jni/Poll.java
tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java
tomcat/trunk/java/org/apache/tomcat/jni/Socket.java
tomcat/trunk/java/org/apache/tomcat/jni/Stdlib.java
Modified: tomcat/trunk/java/org/apache/tomcat/jni/File.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/File.java?rev=1631434&r1=1631433&r2=1631434&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/File.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/File.java Mon Oct 13 15:06:59 2014
@@ -173,7 +173,7 @@ public class File {
public static final int APR_FINFO_GPROT = 0x00200000; /** Group
protection bits */
public static final int APR_FINFO_WPROT = 0x00400000; /** World
protection bits */
public static final int APR_FINFO_ICASE = 0x01000000; /** if dev is case
insensitive */
- public static final int APR_FINFO_NAME = 0x02000000; /** ->name in
proper case */
+ public static final int APR_FINFO_NAME = 0x02000000; /** ->name in
proper case */
public static final int APR_FINFO_MIN = 0x00008170; /** type, mtime,
ctime, atime, size */
public static final int APR_FINFO_IDENT = 0x00003000; /** dev and inode */
@@ -654,8 +654,8 @@ public class File {
/**
* Set the timeout value for a pipe or manipulate the blocking state.
* @param thepipe The pipe we are setting a timeout on.
- * @param timeout The timeout value in microseconds. Values < 0 mean wait
- * forever, 0 means do not wait at all.
+ * @param timeout The timeout value in microseconds. Values < 0 mean
+ * wait forever, 0 means do not wait at all.
*/
public static native int pipeTimeoutSet(long thepipe, long timeout);
Modified: tomcat/trunk/java/org/apache/tomcat/jni/Poll.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Poll.java?rev=1631434&r1=1631433&r2=1631434&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/Poll.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Poll.java Mon Oct 13 15:06:59 2014
@@ -109,8 +109,8 @@ public class Poll {
* The descriptor array must be two times the size of pollset.
* and are populated as follows:
* <PRE>
- * descriptors[2n + 0] -> returned events
- * descriptors[2n + 1] -> socket
+ * descriptors[2n + 0] -> returned events
+ * descriptors[2n + 1] -> socket
* </PRE>
* @param remove Remove signaled descriptors from pollset
* @return Number of signaled descriptors (output parameter)
@@ -126,7 +126,7 @@ public class Poll {
* The descriptor array must be the size of pollset.
* and are populated as follows:
* <PRE>
- * descriptors[n] -> socket
+ * descriptors[n] -> socket
* </PRE>
* @param remove Remove signaled descriptors from pollset
* @return Number of signaled descriptors (output parameter)
@@ -156,8 +156,8 @@ public class Poll {
* The descriptor array must be two times the size of pollset.
* and are populated as follows:
* <PRE>
- * descriptors[2n + 0] -> returned events
- * descriptors[2n + 1] -> socket
+ * descriptors[2n + 0] -> returned events
+ * descriptors[2n + 1] -> socket
* </PRE>
* @return Number of descriptors (output parameter) in the Poll
* or negative APR error code.
@@ -176,7 +176,7 @@ public class Poll {
* Check if interrupt() is allowed.
*
* @param pollset
- * @return <code>true</true> if {@link #interrupt(long)} is allowed, else
+ * @return <code>true</code> if {@link #interrupt(long)} is allowed, else
* <code>false</code>
*/
public static native boolean wakeable(long pollset);
Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java?rev=1631434&r1=1631433&r2=1631434&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java Mon Oct 13 15:06:59
2014
@@ -100,7 +100,7 @@ public final class SSLContext {
* <b>mode</b> valid at the time and may be 0 or 1.
* <br>
* Normally when a SSL connection is finished, the parties must send out
- * "close notify" alert messages using L<SSL_shutdown(3)|SSL_shutdown(3)>
+ * "close notify" alert messages using
L<SSL_shutdown(3)|SSL_shutdown(3)>
* for a clean shutdown.
* <br>
* When setting the "quiet shutdown" flag to 1, <b>SSL.shutdown</b>
Modified: tomcat/trunk/java/org/apache/tomcat/jni/Socket.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Socket.java?rev=1631434&r1=1631433&r2=1631434&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/Socket.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Socket.java Mon Oct 13 15:06:59 2014
@@ -480,10 +480,10 @@ public class Socket {
* @param sock The socket to set up.
* @param t Value for the timeout in microseconds.
* <PRE>
- * t > 0 -- read and write calls return APR_TIMEUP if specified time
+ * t > 0 -- read and write calls return APR_TIMEUP if specified time
* elapses with no data read or written
* t == 0 -- read and write calls never block
- * t < 0 -- read and write calls block
+ * t < 0 -- read and write calls block
* </PRE>
*/
public static native int timeoutSet(long sock, long t);
Modified: tomcat/trunk/java/org/apache/tomcat/jni/Stdlib.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Stdlib.java?rev=1631434&r1=1631433&r2=1631434&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/Stdlib.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Stdlib.java Mon Oct 13 15:06:59 2014
@@ -75,13 +75,13 @@ public class Stdlib {
/**
* Get current process pid.
- * @return current pid or < 1 in case of error.
+ * @return current pid or < 1 in case of error.
*/
public static native int getpid();
/**
* Get current process parent pid.
- * @return parent pid or < 1 in case of error.
+ * @return parent pid or < 1 in case of error.
*/
public static native int getppid();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
