This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 1.2.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/1.2.x by this push:
new 886f3ad6c Align Java code with 9.0.x
886f3ad6c is described below
commit 886f3ad6c20d9303a3f30a8564632d078c49f0cd
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 8 15:50:14 2023 +0000
Align Java code with 9.0.x
---
java/org/apache/tomcat/jni/Address.java | 3 +-
java/org/apache/tomcat/jni/BIOCallback.java | 3 +-
java/org/apache/tomcat/jni/Directory.java | 3 +-
java/org/apache/tomcat/jni/Error.java | 3 +-
java/org/apache/tomcat/jni/File.java | 139 ++++++++++++++-------
java/org/apache/tomcat/jni/FileInfo.java | 12 +-
java/org/apache/tomcat/jni/Global.java | 3 +-
java/org/apache/tomcat/jni/Library.java | 4 -
.../apache/tomcat/jni/LibraryNotFoundError.java | 1 -
java/org/apache/tomcat/jni/Lock.java | 23 ++--
java/org/apache/tomcat/jni/Mmap.java | 3 +-
java/org/apache/tomcat/jni/Multicast.java | 3 +-
java/org/apache/tomcat/jni/OS.java | 3 +-
java/org/apache/tomcat/jni/PasswordCallback.java | 3 +-
java/org/apache/tomcat/jni/Poll.java | 21 ++--
java/org/apache/tomcat/jni/PoolCallback.java | 3 +-
java/org/apache/tomcat/jni/Proc.java | 44 ++++---
java/org/apache/tomcat/jni/ProcErrorCallback.java | 3 +-
java/org/apache/tomcat/jni/Procattr.java | 3 +-
java/org/apache/tomcat/jni/Registry.java | 3 +-
java/org/apache/tomcat/jni/SSL.java | 4 -
java/org/apache/tomcat/jni/SSLConf.java | 2 -
java/org/apache/tomcat/jni/SSLContext.java | 6 +-
java/org/apache/tomcat/jni/SSLSocket.java | 3 +-
java/org/apache/tomcat/jni/Shm.java | 3 +-
java/org/apache/tomcat/jni/Sockaddr.java | 8 +-
java/org/apache/tomcat/jni/Socket.java | 65 ++++++----
java/org/apache/tomcat/jni/Status.java | 6 +-
java/org/apache/tomcat/jni/Stdlib.java | 3 +-
java/org/apache/tomcat/jni/Thread.java | 3 +-
java/org/apache/tomcat/jni/Time.java | 3 +-
java/org/apache/tomcat/jni/User.java | 3 +-
32 files changed, 243 insertions(+), 149 deletions(-)
diff --git a/java/org/apache/tomcat/jni/Address.java
b/java/org/apache/tomcat/jni/Address.java
index acac8008a..a245f21f4 100644
--- a/java/org/apache/tomcat/jni/Address.java
+++ b/java/org/apache/tomcat/jni/Address.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Address
+/**
+ * Address
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/BIOCallback.java
b/java/org/apache/tomcat/jni/BIOCallback.java
index ea9ccff67..24736da84 100644
--- a/java/org/apache/tomcat/jni/BIOCallback.java
+++ b/java/org/apache/tomcat/jni/BIOCallback.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Open SSL BIO Callback Interface
+/**
+ * Open SSL BIO Callback Interface
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Directory.java
b/java/org/apache/tomcat/jni/Directory.java
index 473b87b71..353483ae0 100644
--- a/java/org/apache/tomcat/jni/Directory.java
+++ b/java/org/apache/tomcat/jni/Directory.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Directory
+/**
+ * Directory
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Error.java
b/java/org/apache/tomcat/jni/Error.java
index a72cc15d5..dc312d5d8 100644
--- a/java/org/apache/tomcat/jni/Error.java
+++ b/java/org/apache/tomcat/jni/Error.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Error
+/**
+ * Error
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/File.java
b/java/org/apache/tomcat/jni/File.java
index 3e0c3b1bc..4ba2e16de 100644
--- a/java/org/apache/tomcat/jni/File.java
+++ b/java/org/apache/tomcat/jni/File.java
@@ -18,7 +18,8 @@ package org.apache.tomcat.jni;
/* Import needed classes */
import java.nio.ByteBuffer;
-/** File
+/**
+ * File
*
* @author Mladen Turk
*
@@ -48,21 +49,25 @@ public class File {
public static final int APR_FOPEN_BUFFERED = 0x00080;
/** Delete the file after close */
public static final int APR_FOPEN_DELONCLOSE = 0x00100;
- /** Platform dependent tag to open the file for
+ /**
+ * Platform dependent tag to open the file for
* use across multiple threads
*/
public static final int APR_FOPEN_XTHREAD = 0x00200;
- /** Platform dependent support for higher level locked read/write
+ /**
+ * Platform dependent support for higher level locked read/write
* access to support writes across process/machines
*/
public static final int APR_FOPEN_SHARELOCK = 0x00400;
/** Do not register a cleanup when the file is opened */
public static final int APR_FOPEN_NOCLEANUP = 0x00800;
- /** Advisory flag that this file should support
+ /**
+ * Advisory flag that this file should support
* apr_socket_sendfile operation
*/
public static final int APR_FOPEN_SENDFILE_ENABLED = 0x01000;
- /** Platform dependent flag to enable large file support;
+ /**
+ * Platform dependent flag to enable large file support;
* <br><b>Warning :</b> The APR_LARGEFILE flag only has effect on some
platforms
* where sizeof(apr_off_t) == 4. Where implemented, it allows opening
* and writing to a file which exceeds the size which can be
@@ -95,13 +100,15 @@ public class File {
/* File lock types/flags */
- /** Shared lock. More than one process or thread can hold a shared lock
+ /**
+ * Shared lock. More than one process or thread can hold a shared lock
* at any given time. Essentially, this is a "read lock", preventing
* writers from establishing an exclusive lock.
*/
public static final int APR_FLOCK_SHARED = 1;
- /** Exclusive lock. Only one process may hold an exclusive lock at any
+ /**
+ * Exclusive lock. Only one process may hold an exclusive lock at any
* given time. This is analogous to a "write lock".
*/
public static final int APR_FLOCK_EXCLUSIVE = 2;
@@ -144,48 +151,84 @@ public class File {
/*
* apr_file_permissions File Permissions flags
*/
+ /** Set user id */
+ public static final int APR_FPROT_USETID = 0x8000;
+ /** Read by user */
+ public static final int APR_FPROT_UREAD = 0x0400;
+ /** Write by user */
+ public static final int APR_FPROT_UWRITE = 0x0200;
+ /** Execute by user */
+ public static final int APR_FPROT_UEXECUTE = 0x0100;
+
+ /** Set group id */
+ public static final int APR_FPROT_GSETID = 0x4000;
+ /** Read by group */
+ public static final int APR_FPROT_GREAD = 0x0040;
+ /** Write by group */
+ public static final int APR_FPROT_GWRITE = 0x0020;
+ /** Execute by group */
+ public static final int APR_FPROT_GEXECUTE = 0x0010;
+
+ /** Sticky bit */
+ public static final int APR_FPROT_WSTICKY = 0x2000;
+ /** Read by others */
+ public static final int APR_FPROT_WREAD = 0x0004;
+ /** Write by others */
+ public static final int APR_FPROT_WWRITE = 0x0002;
+ /** Execute by others */
+ public static final int APR_FPROT_WEXECUTE = 0x0001;
+ /** use OS's default permissions */
+ public static final int APR_FPROT_OS_DEFAULT = 0x0FFF;
+
+
+ /** Stat the link not the file itself if it is a link */
+ public static final int APR_FINFO_LINK = 0x00000001;
+ /** Modification Time */
+ public static final int APR_FINFO_MTIME = 0x00000010;
+ /** Creation or inode-changed time */
+ public static final int APR_FINFO_CTIME = 0x00000020;
+ /** Access Time */
+ public static final int APR_FINFO_ATIME = 0x00000040;
+ /** Size of the file */
+ public static final int APR_FINFO_SIZE = 0x00000100;
+ /** Storage size consumed by the file */
+ public static final int APR_FINFO_CSIZE = 0x00000200;
+ /** Device */
+ public static final int APR_FINFO_DEV = 0x00001000;
+ /** Inode */
+ public static final int APR_FINFO_INODE = 0x00002000;
+ /** Number of links */
+ public static final int APR_FINFO_NLINK = 0x00004000;
+ /** Type */
+ public static final int APR_FINFO_TYPE = 0x00008000;
+ /** User */
+ public static final int APR_FINFO_USER = 0x00010000;
+ /** Group */
+ public static final int APR_FINFO_GROUP = 0x00020000;
+ /** User protection bits */
+ public static final int APR_FINFO_UPROT = 0x00100000;
+ /** Group protection bits */
+ public static final int APR_FINFO_GPROT = 0x00200000;
+ /** World protection bits */
+ public static final int APR_FINFO_WPROT = 0x00400000;
+ /** if dev is case insensitive */
+ public static final int APR_FINFO_ICASE = 0x01000000;
+ /** ->name in proper case */
+ public static final int APR_FINFO_NAME = 0x02000000;
+
+ /** type, mtime, ctime, atime, size */
+ public static final int APR_FINFO_MIN = 0x00008170;
+ /** dev and inode */
+ public static final int APR_FINFO_IDENT = 0x00003000;
+ /** user and group */
+ public static final int APR_FINFO_OWNER = 0x00030000;
+ /** all protections */
+ public static final int APR_FINFO_PROT = 0x00700000;
+ /** an atomic unix apr_stat() */
+ public static final int APR_FINFO_NORM = 0x0073b170;
+ /** an atomic unix apr_dir_read() */
+ public static final int APR_FINFO_DIRENT = 0x02000000;
- public static final int APR_FPROT_USETID = 0x8000; /** Set user id */
- public static final int APR_FPROT_UREAD = 0x0400; /** Read by user */
- public static final int APR_FPROT_UWRITE = 0x0200; /** Write by user */
- public static final int APR_FPROT_UEXECUTE = 0x0100; /** Execute by user
*/
-
- public static final int APR_FPROT_GSETID = 0x4000; /** Set group id */
- public static final int APR_FPROT_GREAD = 0x0040; /** Read by group */
- public static final int APR_FPROT_GWRITE = 0x0020; /** Write by group
*/
- public static final int APR_FPROT_GEXECUTE = 0x0010; /** Execute by
group */
-
- public static final int APR_FPROT_WSTICKY = 0x2000; /** Sticky bit */
- public static final int APR_FPROT_WREAD = 0x0004; /** Read by others
*/
- public static final int APR_FPROT_WWRITE = 0x0002; /** Write by others
*/
- public static final int APR_FPROT_WEXECUTE = 0x0001; /** Execute by
others */
- public static final int APR_FPROT_OS_DEFAULT = 0x0FFF; /** use OS's
default permissions */
-
-
- public static final int APR_FINFO_LINK = 0x00000001; /** Stat the link
not the file itself if it is a link */
- public static final int APR_FINFO_MTIME = 0x00000010; /** Modification
Time */
- public static final int APR_FINFO_CTIME = 0x00000020; /** Creation or
inode-changed time */
- public static final int APR_FINFO_ATIME = 0x00000040; /** Access Time */
- public static final int APR_FINFO_SIZE = 0x00000100; /** Size of the
file */
- public static final int APR_FINFO_CSIZE = 0x00000200; /** Storage size
consumed by the file */
- public static final int APR_FINFO_DEV = 0x00001000; /** Device */
- public static final int APR_FINFO_INODE = 0x00002000; /** Inode */
- public static final int APR_FINFO_NLINK = 0x00004000; /** Number of links
*/
- public static final int APR_FINFO_TYPE = 0x00008000; /** Type */
- public static final int APR_FINFO_USER = 0x00010000; /** User */
- public static final int APR_FINFO_GROUP = 0x00020000; /** Group */
- public static final int APR_FINFO_UPROT = 0x00100000; /** User protection
bits */
- 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_MIN = 0x00008170; /** type, mtime,
ctime, atime, size */
- public static final int APR_FINFO_IDENT = 0x00003000; /** dev and inode */
- public static final int APR_FINFO_OWNER = 0x00030000; /** user and group
*/
- public static final int APR_FINFO_PROT = 0x00700000; /** all
protections */
- public static final int APR_FINFO_NORM = 0x0073b170; /** an atomic unix
apr_stat() */
- public static final int APR_FINFO_DIRENT = 0x02000000; /** an atomic unix
apr_dir_read() */
diff --git a/java/org/apache/tomcat/jni/FileInfo.java
b/java/org/apache/tomcat/jni/FileInfo.java
index 34b67ff01..ea18f7e02 100644
--- a/java/org/apache/tomcat/jni/FileInfo.java
+++ b/java/org/apache/tomcat/jni/FileInfo.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Fileinfo
+/**
+ * Fileinfo
*
* @author Mladen Turk
*
@@ -30,12 +31,15 @@ public class FileInfo {
/** Allocates memory and closes lingering handles in the specified pool */
public long pool;
- /** The bitmask describing valid fields of this apr_finfo_t structure
- * including all available 'wanted' fields and potentially more */
+ /**
+ * The bitmask describing valid fields of this apr_finfo_t structure
+ * including all available 'wanted' fields and potentially more.
+ */
public int valid;
/** The access permissions of the file. Mimics Unix access rights. */
public int protection;
- /** The type of file. One of APR_REG, APR_DIR, APR_CHR, APR_BLK, APR_PIPE,
+ /**
+ * The type of file. One of APR_REG, APR_DIR, APR_CHR, APR_BLK, APR_PIPE,
* APR_LNK or APR_SOCK. If the type is undetermined, the value is
APR_NOFILE.
* If the type cannot be determined, the value is APR_UNKFILE.
*/
diff --git a/java/org/apache/tomcat/jni/Global.java
b/java/org/apache/tomcat/jni/Global.java
index 7da6740f8..3f9e4bd83 100644
--- a/java/org/apache/tomcat/jni/Global.java
+++ b/java/org/apache/tomcat/jni/Global.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Global
+/**
+ * Global
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Library.java
b/java/org/apache/tomcat/jni/Library.java
index b7febeb43..cbff50e60 100644
--- a/java/org/apache/tomcat/jni/Library.java
+++ b/java/org/apache/tomcat/jni/Library.java
@@ -18,10 +18,6 @@ package org.apache.tomcat.jni;
import java.io.File;
-/** Library
- *
- * @author Mladen Turk
- */
public final class Library {
/* Default library names */
diff --git a/java/org/apache/tomcat/jni/LibraryNotFoundError.java
b/java/org/apache/tomcat/jni/LibraryNotFoundError.java
index ab8a030e8..ede1ee108 100644
--- a/java/org/apache/tomcat/jni/LibraryNotFoundError.java
+++ b/java/org/apache/tomcat/jni/LibraryNotFoundError.java
@@ -23,7 +23,6 @@ public class LibraryNotFoundError extends
UnsatisfiedLinkError {
private final String libraryNames;
/**
- *
* @param libraryNames A list of the file names of the native libraries
that
* failed to load
* @param errors A list of the error messages received when trying to load
diff --git a/java/org/apache/tomcat/jni/Lock.java
b/java/org/apache/tomcat/jni/Lock.java
index 9803197cf..f8bb48084 100644
--- a/java/org/apache/tomcat/jni/Lock.java
+++ b/java/org/apache/tomcat/jni/Lock.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Lock
+/**
+ * Lock
*
* @author Mladen Turk
*
@@ -28,18 +29,24 @@ package org.apache.tomcat.jni;
@Deprecated
public class Lock {
- /**
+ /*
* Enumerated potential types for APR process locking methods
* <br><b>Warning :</b> Check APR_HAS_foo_SERIALIZE defines to see if the
platform supports
* APR_LOCK_foo. Only APR_LOCK_DEFAULT is portable.
*/
- public static final int APR_LOCK_FCNTL = 0; /** fcntl() */
- public static final int APR_LOCK_FLOCK = 1; /** flock() */
- public static final int APR_LOCK_SYSVSEM = 2; /** System V Semaphores
*/
- public static final int APR_LOCK_PROC_PTHREAD = 3; /** POSIX pthread
process-based locking */
- public static final int APR_LOCK_POSIXSEM = 4; /** POSIX semaphore
process-based locking */
- public static final int APR_LOCK_DEFAULT = 5; /** Use the default
process lock */
+ /** fcntl() */
+ public static final int APR_LOCK_FCNTL = 0;
+ /** flock() */
+ public static final int APR_LOCK_FLOCK = 1;
+ /** System V Semaphores */
+ public static final int APR_LOCK_SYSVSEM = 2;
+ /** POSIX pthread process-based locking */
+ public static final int APR_LOCK_PROC_PTHREAD = 3;
+ /** POSIX semaphore process-based locking */
+ public static final int APR_LOCK_POSIXSEM = 4;
+ /** Use the default process lock */
+ public static final int APR_LOCK_DEFAULT = 5;
/**
* Create and initialize a mutex that can be used to synchronize processes.
diff --git a/java/org/apache/tomcat/jni/Mmap.java
b/java/org/apache/tomcat/jni/Mmap.java
index 16a88a151..0467c0980 100644
--- a/java/org/apache/tomcat/jni/Mmap.java
+++ b/java/org/apache/tomcat/jni/Mmap.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Mmap
+/**
+ * Mmap
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Multicast.java
b/java/org/apache/tomcat/jni/Multicast.java
index fd090fdc2..210b59dd3 100644
--- a/java/org/apache/tomcat/jni/Multicast.java
+++ b/java/org/apache/tomcat/jni/Multicast.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Multicast
+/**
+ * Multicast
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/OS.java
b/java/org/apache/tomcat/jni/OS.java
index 48f7192c9..0105efcfa 100644
--- a/java/org/apache/tomcat/jni/OS.java
+++ b/java/org/apache/tomcat/jni/OS.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** OS
+/**
+ * OS
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/PasswordCallback.java
b/java/org/apache/tomcat/jni/PasswordCallback.java
index 5c579ddd5..77e08073f 100644
--- a/java/org/apache/tomcat/jni/PasswordCallback.java
+++ b/java/org/apache/tomcat/jni/PasswordCallback.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** PasswordCallback Interface
+/**
+ * PasswordCallback Interface
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Poll.java
b/java/org/apache/tomcat/jni/Poll.java
index 54f422168..2afecf9a6 100644
--- a/java/org/apache/tomcat/jni/Poll.java
+++ b/java/org/apache/tomcat/jni/Poll.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Poll
+/**
+ * Poll
*
* @author Mladen Turk
*
@@ -28,7 +29,7 @@ package org.apache.tomcat.jni;
@Deprecated
public class Poll {
- /**
+ /*
* Poll return values
*/
/** Can read without blocking */
@@ -44,20 +45,24 @@ public class Poll {
/** Descriptor invalid */
public static final int APR_POLLNVAL = 0x040;
- /**
+ /*
* Pollset Flags
*/
/** Adding or Removing a Descriptor is thread safe */
public static final int APR_POLLSET_THREADSAFE = 0x001;
- /** Used in apr_pollfd_t to determine what the apr_descriptor is
+ /* Used in apr_pollfd_t to determine what the apr_descriptor is
* apr_datatype_e enum
*/
- public static final int APR_NO_DESC = 0; /** nothing here */
- public static final int APR_POLL_SOCKET = 1; /** descriptor refers to a
socket */
- public static final int APR_POLL_FILE = 2; /** descriptor refers to a
file */
- public static final int APR_POLL_LASTDESC = 3; /** descriptor is the last
one in the list */
+ /** nothing here */
+ public static final int APR_NO_DESC = 0;
+ /** descriptor refers to a socket */
+ public static final int APR_POLL_SOCKET = 1;
+ /** descriptor refers to a file */
+ public static final int APR_POLL_FILE = 2;
+ /** descriptor is the last one in the list */
+ public static final int APR_POLL_LASTDESC = 3;
/**
* Setup a pollset object.
diff --git a/java/org/apache/tomcat/jni/PoolCallback.java
b/java/org/apache/tomcat/jni/PoolCallback.java
index c709979fc..1e75c9200 100644
--- a/java/org/apache/tomcat/jni/PoolCallback.java
+++ b/java/org/apache/tomcat/jni/PoolCallback.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** PoolCallback Interface
+/**
+ * PoolCallback Interface
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Proc.java
b/java/org/apache/tomcat/jni/Proc.java
index 4ea678b6a..c09d71fe0 100644
--- a/java/org/apache/tomcat/jni/Proc.java
+++ b/java/org/apache/tomcat/jni/Proc.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Proc
+/**
+ * Proc
*
* @author Mladen Turk
*
@@ -31,26 +32,34 @@ public class Proc {
/*
* apr_cmdtype_e enum
*/
- public static final int APR_SHELLCM = 0; /** use the shell to invoke
the program */
- public static final int APR_PROGRAM = 1; /** invoke the program
directly, no copied env */
- public static final int APR_PROGRAM_ENV = 2; /** invoke the program,
replicating our environment */
- public static final int APR_PROGRAM_PATH = 3; /** find program on PATH,
use our environment */
- public static final int APR_SHELLCMD_ENV = 4; /** use the shell to invoke
the program,
- * replicating our
environment
- */
+ /** use the shell to invoke the program */
+ public static final int APR_SHELLCM = 0;
+ /** invoke the program directly, no copied env */
+ public static final int APR_PROGRAM = 1;
+ /** invoke the program, replicating our environment */
+ public static final int APR_PROGRAM_ENV = 2;
+ /** find program on PATH, use our environment */
+ public static final int APR_PROGRAM_PATH = 3;
+ /** use the shell to invoke the program, replicating our environment */
+ public static final int APR_SHELLCMD_ENV = 4;
/*
* apr_wait_how_e enum
*/
- public static final int APR_WAIT = 0; /** wait for the specified process
to finish */
- public static final int APR_NOWAIT = 1; /** do not wait -- just see if it
has finished */
+ /** wait for the specified process to finish */
+ public static final int APR_WAIT = 0;
+ /** do not wait -- just see if it has finished */
+ public static final int APR_NOWAIT = 1;
/*
* apr_exit_why_e enum
*/
- public static final int APR_PROC_EXIT = 1; /** process exited
normally */
- public static final int APR_PROC_SIGNAL = 2; /** process exited due
to a signal */
- public static final int APR_PROC_SIGNAL_CORE = 4; /** process exited and
dumped a core file */
+ /** process exited normally */
+ public static final int APR_PROC_EXIT = 1;
+ /** process exited due to a signal */
+ public static final int APR_PROC_SIGNAL = 2;
+ /** process exited and dumped a core file */
+ public static final int APR_PROC_SIGNAL_CORE = 4;
public static final int APR_NO_PIPE = 0;
public static final int APR_FULL_BLOCK = 1;
@@ -68,17 +77,20 @@ public class Proc {
public static final int APR_OC_REASON_DEATH = 0;
/** write_fd is unwritable */
public static final int APR_OC_REASON_UNWRITABLE = 1;
- /** a restart is occurring, perform any necessary cleanup (including
+ /**
+ * a restart is occurring, perform any necessary cleanup (including
* sending a special signal to child)
*/
public static final int APR_OC_REASON_RESTART = 2;
- /** unregister has been called, do whatever is necessary (including
+ /**
+ * unregister has been called, do whatever is necessary (including
* kill the child)
*/
public static final int APR_OC_REASON_UNREGISTER = 3;
/** somehow the child exited without us knowing ... buggy os? */
public static final int APR_OC_REASON_LOST = 4;
- /** a health check is occurring, for most maintenance functions
+ /**
+ * a health check is occurring, for most maintenance functions
* this is a no-op.
*/
public static final int APR_OC_REASON_RUNNING = 5;
diff --git a/java/org/apache/tomcat/jni/ProcErrorCallback.java
b/java/org/apache/tomcat/jni/ProcErrorCallback.java
index a9421bc03..692e7c7c2 100644
--- a/java/org/apache/tomcat/jni/ProcErrorCallback.java
+++ b/java/org/apache/tomcat/jni/ProcErrorCallback.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** ProcErrorCallback Interface
+/**
+ * ProcErrorCallback Interface
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Procattr.java
b/java/org/apache/tomcat/jni/Procattr.java
index 40800d118..26512147e 100644
--- a/java/org/apache/tomcat/jni/Procattr.java
+++ b/java/org/apache/tomcat/jni/Procattr.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Procattr
+/**
+ * Procattr
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Registry.java
b/java/org/apache/tomcat/jni/Registry.java
index 7a535f974..bf32f796c 100644
--- a/java/org/apache/tomcat/jni/Registry.java
+++ b/java/org/apache/tomcat/jni/Registry.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Windows Registry support
+/**
+ * Windows Registry support
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/SSL.java
b/java/org/apache/tomcat/jni/SSL.java
index 652921bf6..bed1d1fa5 100644
--- a/java/org/apache/tomcat/jni/SSL.java
+++ b/java/org/apache/tomcat/jni/SSL.java
@@ -16,10 +16,6 @@
*/
package org.apache.tomcat.jni;
-/** SSL
- *
- * @author Mladen Turk
- */
public final class SSL {
/*
diff --git a/java/org/apache/tomcat/jni/SSLConf.java
b/java/org/apache/tomcat/jni/SSLConf.java
index db855fc05..2e429a5cd 100644
--- a/java/org/apache/tomcat/jni/SSLConf.java
+++ b/java/org/apache/tomcat/jni/SSLConf.java
@@ -16,8 +16,6 @@
*/
package org.apache.tomcat.jni;
-/** SSL Conf
- */
public final class SSLConf {
/**
diff --git a/java/org/apache/tomcat/jni/SSLContext.java
b/java/org/apache/tomcat/jni/SSLContext.java
index 1363aeaf4..cba81b74d 100644
--- a/java/org/apache/tomcat/jni/SSLContext.java
+++ b/java/org/apache/tomcat/jni/SSLContext.java
@@ -20,10 +20,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-/** SSL Context
- *
- * @author Mladen Turk
- */
public final class SSLContext {
public static final byte[] DEFAULT_SESSION_ID_CONTEXT =
@@ -225,7 +221,7 @@ public final class SSLContext {
* Point setCertificateFile at a PEM encoded certificate. If
* the certificate is encrypted, then you will be prompted for a
* pass phrase. Note that a kill -HUP will prompt again. A test
- * certificate can be generated with `make certificate' under
+ * certificate can be generated with 'make certificate' under
* built time. Keep in mind that if you've both a RSA and a DSA
* certificate you can configure both in parallel (to also allow
* the use of DSA ciphers, etc.)
diff --git a/java/org/apache/tomcat/jni/SSLSocket.java
b/java/org/apache/tomcat/jni/SSLSocket.java
index 2e1b316ed..12c79f08c 100644
--- a/java/org/apache/tomcat/jni/SSLSocket.java
+++ b/java/org/apache/tomcat/jni/SSLSocket.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** SSL Socket
+/**
+ * SSL Socket
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Shm.java
b/java/org/apache/tomcat/jni/Shm.java
index f62d4aa39..d5a7b3436 100644
--- a/java/org/apache/tomcat/jni/Shm.java
+++ b/java/org/apache/tomcat/jni/Shm.java
@@ -18,7 +18,8 @@ package org.apache.tomcat.jni;
import java.nio.ByteBuffer;
-/** Shm
+/**
+ * Shm
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Sockaddr.java
b/java/org/apache/tomcat/jni/Sockaddr.java
index 9d138ec36..eada7424f 100644
--- a/java/org/apache/tomcat/jni/Sockaddr.java
+++ b/java/org/apache/tomcat/jni/Sockaddr.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Sockaddr
+/**
+ * Sockaddr
*
* @author Mladen Turk
*
@@ -38,8 +39,9 @@ public class Sockaddr {
public int port;
/** The family */
public int family;
- /** If multiple addresses were found by apr_sockaddr_info_get(), this
- * points to a representation of the next address. */
+ /**
+ * If multiple addresses were found by apr_sockaddr_info_get(), this
+ * points to a representation of the next address. */
public long next;
}
diff --git a/java/org/apache/tomcat/jni/Socket.java
b/java/org/apache/tomcat/jni/Socket.java
index cbc2a01c2..242ded1f0 100644
--- a/java/org/apache/tomcat/jni/Socket.java
+++ b/java/org/apache/tomcat/jni/Socket.java
@@ -19,7 +19,8 @@ package org.apache.tomcat.jni;
/* Import needed classes */
import java.nio.ByteBuffer;
-/** Socket
+/**
+ * Socket
*
* @author Mladen Turk
*
@@ -37,23 +38,34 @@ public class Socket {
/*
* apr_sockopt Socket option definitions
*/
- public static final int APR_SO_LINGER = 1; /** Linger */
- public static final int APR_SO_KEEPALIVE = 2; /** Keepalive */
- public static final int APR_SO_DEBUG = 4; /** Debug */
- public static final int APR_SO_NONBLOCK = 8; /** Non-blocking IO */
- public static final int APR_SO_REUSEADDR = 16; /** Reuse addresses */
- public static final int APR_SO_SNDBUF = 64; /** Send buffer */
- public static final int APR_SO_RCVBUF = 128; /** Receive buffer */
- public static final int APR_SO_DISCONNECTED = 256; /** Disconnected */
+ /** Linger */
+ public static final int APR_SO_LINGER = 1;
+ /** Keepalive */
+ public static final int APR_SO_KEEPALIVE = 2;
+ /** Debug */
+ public static final int APR_SO_DEBUG = 4;
+ /** Non-blocking IO */
+ public static final int APR_SO_NONBLOCK = 8;
+ /** Reuse addresses */
+ public static final int APR_SO_REUSEADDR = 16;
+ /** Send buffer */
+ public static final int APR_SO_SNDBUF = 64;
+ /** Receive buffer */
+ public static final int APR_SO_RCVBUF = 128;
+ /** Disconnected */
+ public static final int APR_SO_DISCONNECTED = 256;
/** For SCTP sockets, this is mapped to STCP_NODELAY internally. */
public static final int APR_TCP_NODELAY = 512;
- public static final int APR_TCP_NOPUSH = 1024; /** No push */
- /** This flag is ONLY set internally when we set APR_TCP_NOPUSH with
+ /** No push */
+ public static final int APR_TCP_NOPUSH = 1024;
+ /**
+ * This flag is ONLY set internally when we set APR_TCP_NOPUSH with
* APR_TCP_NODELAY set to tell us that APR_TCP_NODELAY should be turned on
* again when NOPUSH is turned off
*/
public static final int APR_RESET_NODELAY = 2048;
- /** Set on non-blocking sockets (timeout != 0) on which the
+ /**
+ * Set on non-blocking sockets (timeout != 0) on which the
* previous read() did not fill a buffer completely. the next
* apr_socket_recv() will first call select()/poll() rather than
* going straight into read(). (Can also be set by an application to
@@ -61,22 +73,22 @@ public class Socket {
* the app expects that an immediate read would fail.)
*/
public static final int APR_INCOMPLETE_READ = 4096;
- /** like APR_INCOMPLETE_READ, but for write
- */
+ /** like APR_INCOMPLETE_READ, but for write */
public static final int APR_INCOMPLETE_WRITE = 8192;
- /** Don't accept IPv4 connections on an IPv6 listening socket.
- */
+ /** Don't accept IPv4 connections on an IPv6 listening socket. */
public static final int APR_IPV6_V6ONLY = 16384;
- /** Delay accepting of new connections until data is available.
- */
+ /** Delay accepting of new connections until data is available. */
public static final int APR_TCP_DEFER_ACCEPT = 32768;
- /** Define what type of socket shutdown should occur.
+ /* Define what type of socket shutdown should occur.
* apr_shutdown_how_e enum
*/
- public static final int APR_SHUTDOWN_READ = 0; /** no longer allow
read request */
- public static final int APR_SHUTDOWN_WRITE = 1; /** no longer allow
write requests */
- public static final int APR_SHUTDOWN_READWRITE = 2; /** no longer allow
read or write requests */
+ /** no longer allow read request */
+ public static final int APR_SHUTDOWN_READ = 0;
+ /** no longer allow write requests */
+ public static final int APR_SHUTDOWN_WRITE = 1;
+ /** no longer allow read or write requests */
+ public static final int APR_SHUTDOWN_READWRITE = 2;
public static final int APR_IPV4_ADDR_OK = 0x01;
public static final int APR_IPV6_ADDR_OK = 0x02;
@@ -86,9 +98,12 @@ public class Socket {
public static final int APR_INET6 = 2;
public static final int APR_UNIX = 3;
- public static final int APR_PROTO_TCP = 6; /** TCP */
- public static final int APR_PROTO_UDP = 17; /** UDP */
- public static final int APR_PROTO_SCTP = 132; /** SCTP */
+ /** TCP */
+ public static final int APR_PROTO_TCP = 6;
+ /** UDP */
+ public static final int APR_PROTO_UDP = 17;
+ /** SCTP */
+ public static final int APR_PROTO_SCTP = 132;
/**
* Enum to tell us if we're interested in remote or local socket
diff --git a/java/org/apache/tomcat/jni/Status.java
b/java/org/apache/tomcat/jni/Status.java
index 004340cda..f1b0c6224 100644
--- a/java/org/apache/tomcat/jni/Status.java
+++ b/java/org/apache/tomcat/jni/Status.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Status
+/**
+ * Status
*
* @author Mladen Turk
*
@@ -129,7 +130,8 @@ public class Status {
public static final int APR_EPROC_UNKNOWN = (APR_OS_START_ERROR + 27);
public static final int APR_ENOTENOUGHENTROPY = (APR_OS_START_ERROR + 28);
- /** APR Status Values
+ /**
+ * APR Status Values
* <PRE>
* <b>APR STATUS VALUES</b>
* APR_INCHILD Program is currently executing in the child
diff --git a/java/org/apache/tomcat/jni/Stdlib.java
b/java/org/apache/tomcat/jni/Stdlib.java
index 18e8fb217..be49b97d8 100644
--- a/java/org/apache/tomcat/jni/Stdlib.java
+++ b/java/org/apache/tomcat/jni/Stdlib.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Stdlib
+/**
+ * Stdlib
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Thread.java
b/java/org/apache/tomcat/jni/Thread.java
index 277cfb61a..4b2644a5a 100644
--- a/java/org/apache/tomcat/jni/Thread.java
+++ b/java/org/apache/tomcat/jni/Thread.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Thread
+/**
+ * Thread
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Time.java
b/java/org/apache/tomcat/jni/Time.java
index 24b054020..241f8e2f1 100644
--- a/java/org/apache/tomcat/jni/Time.java
+++ b/java/org/apache/tomcat/jni/Time.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Time
+/**
+ * Time
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/User.java
b/java/org/apache/tomcat/jni/User.java
index b9a0547e8..1f1295e17 100644
--- a/java/org/apache/tomcat/jni/User.java
+++ b/java/org/apache/tomcat/jni/User.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** User
+/**
+ * User
*
* @author Mladen Turk
*
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
