Author: markt
Date: Tue Apr 7 14:19:36 2015
New Revision: 1671855
URL: http://svn.apache.org/r1671855
Log:
Align with 8.0.x - Javadoc fixes
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/File.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Global.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Lock.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Multicast.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Poll.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Pool.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Procattr.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSLContext.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Shm.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Socket.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Status.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Stdlib.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Time.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/File.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/File.java?rev=1671855&r1=1671854&r2=1671855&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/File.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/File.java Tue Apr 7
14:19:36 2015
@@ -58,7 +58,7 @@ public class File {
*/
public static final int APR_FOPEN_SENDFILE_ENABLED = 0x01000;
/** Platform dependent flag to enable large file support;
- * <br /><b>Warning :</b> The APR_LARGEFILE flag only has effect on some
platforms
+ * <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
* represented by apr_off_t (2 gigabytes). When a file's size does
@@ -107,7 +107,7 @@ public class File {
/* apr_filetype_e values for the filetype member of the
* apr_file_info_t structure
- * <br /><b>Warning :</b>: Not all of the filetypes below can be
determined.
+ * <br><b>Warning :</b>: Not all of the filetypes below can be determined.
* For example, a given platform might not correctly report
* a socket descriptor as APR_SOCK if that type isn't
* well-identified on that platform. In such cases where
@@ -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 */
@@ -263,7 +263,7 @@ public class File {
/**
* Rename the specified file.
- * <br /><b>Warning :</b> If a file exists at the new location, then it
will be
+ * <br><b>Warning :</b> If a file exists at the new location, then it will
be
* overwritten. Moving files or directories across devices may not be
* possible.
* @param fromPath The full path to the original file (using / on all
systems)
@@ -275,7 +275,7 @@ public class File {
/**
* Copy the specified file to another file.
* The new file does not need to exist, it will be created if required.
- * <br /><b>Warning :</b> If the new file already exists, its contents
will be overwritten.
+ * <br><b>Warning :</b> If the new file already exists, its contents will
be overwritten.
* @param fromPath The full path to the original file (using / on all
systems)
* @param toPath The full path to the new file (using / on all systems)
* @param perms Access permissions for the new file if it is created.
@@ -562,10 +562,10 @@ public class File {
/**
* Set the specified file's permission bits.
- * <br /><b>Warning :</b> Some platforms may not be able to apply all of
the
+ * <br><b>Warning :</b> Some platforms may not be able to apply all of the
* available permission bits; APR_INCOMPLETE will be returned if some
* permissions are specified which could not be set.
- * <br /><b>Warning :</b> Platforms which do not implement this feature
will return
+ * <br><b>Warning :</b> Platforms which do not implement this feature will
return
* APR_ENOTIMPL.
* @param fname The file (name) to apply the permissions to.
* @param perms The permission bits to apply to the file.
@@ -579,7 +579,7 @@ public class File {
* of the file permissions, because the operations to provide these
* attributes are platform specific and may involve more than simply
* setting permission bits.
- * <br /><b>Warning :</b> Platforms which do not implement this feature
will return
+ * <br><b>Warning :</b> Platforms which do not implement this feature will
return
* APR_ENOTIMPL.
* @param fname The full path to the file (using / on all systems)
* @param attributes Or'd combination of
@@ -595,7 +595,7 @@ public class File {
/**
* Set the mtime of the specified file.
- * <br /><b>Warning :</b> Platforms which do not implement this feature
will return
+ * <br><b>Warning :</b> Platforms which do not implement this feature will
return
* APR_ENOTIMPL.
* @param fname The full path to the file (using / on all systems)
* @param mtime The mtime to apply to the file in microseconds
@@ -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/tc7.0.x/trunk/java/org/apache/tomcat/jni/Global.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Global.java?rev=1671855&r1=1671854&r2=1671855&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Global.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Global.java Tue Apr 7
14:19:36 2015
@@ -29,7 +29,7 @@ public class Global {
* this API if only cross-process or cross-thread mutual exclusion is
* required. See apr_proc_mutex.h and apr_thread_mutex.h for more
* specialized lock routines.
- * <br /><b>Warning :</b> Check APR_HAS_foo_SERIALIZE defines to see if
the platform supports
+ * <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.
* @param fname A file name to use if the lock mechanism requires one.
This
* argument should always be provided. The lock code itself will
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Lock.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Lock.java?rev=1671855&r1=1671854&r2=1671855&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Lock.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Lock.java Tue Apr 7
14:19:36 2015
@@ -25,7 +25,7 @@ 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
+ * <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.
*/
@@ -38,7 +38,7 @@ public class Lock {
/**
* Create and initialize a mutex that can be used to synchronize processes.
- * <br /><b>Warning :</b> Check APR_HAS_foo_SERIALIZE defines to see if
the platform supports
+ * <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.
* @param fname A file name to use if the lock mechanism requires one.
This
* argument should always be provided. The lock code itself will
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Multicast.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Multicast.java?rev=1671855&r1=1671854&r2=1671855&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Multicast.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Multicast.java Tue Apr 7
14:19:36 2015
@@ -52,7 +52,7 @@ public class Multicast {
* Set the Multicast Time to Live (ttl) for a multicast transmission.
* @param sock The socket to set the multicast ttl
* @param ttl Time to live to Assign. 0-255, default=1
- * <br /><b>Remark :</b> If the TTL is 0, packets will only be seen
+ * <br><b>Remark :</b> If the TTL is 0, packets will only be seen
* by sockets on the local machine,
* and only when multicast loopback is enabled.
*/
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=1671855&r1=1671854&r2=1671855&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 Tue Apr 7
14:19:36 2015
@@ -111,8 +111,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)
@@ -128,7 +128,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)
@@ -158,12 +158,11 @@ 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.
*/
public static native int pollset(long pollset, long [] descriptors);
-
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Pool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Pool.java?rev=1671855&r1=1671854&r2=1671855&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Pool.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Pool.java Tue Apr 7
14:19:36 2015
@@ -137,7 +137,7 @@ public class Pool {
* @param data The user data associated with the pool.
* @param key The key to use for association
* @param pool The current pool
- * <br /><b>Warning :</b>
+ * <br><b>Warning :</b>
* The data to be attached to the pool should have a life span
* at least as long as the pool it is being attached to.
* Object attached to the pool will be globally referenced
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Procattr.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Procattr.java?rev=1671855&r1=1671854&r2=1671855&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Procattr.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Procattr.java Tue Apr 7
14:19:36 2015
@@ -42,7 +42,7 @@ public class Procattr {
public static native int ioSet(long attr, int in, int out, int err);
/**
* Set the child_in and/or parent_in values to existing apr_file_t values.
- * <br />
+ * <br>
* This is NOT a required initializer function. This is
* useful if you have already opened a pipe (or multiple files)
* that you wish to use, perhaps persistently across multiple
@@ -57,7 +57,7 @@ public class Procattr {
/**
* Set the child_out and parent_out values to existing apr_file_t values.
- * <br />
+ * <br>
* This is NOT a required initializer function. This is
* useful if you have already opened a pipe (or multiple files)
* that you wish to use, perhaps persistently across multiple
@@ -70,7 +70,7 @@ public class Procattr {
/**
* Set the child_err and parent_err values to existing apr_file_t values.
- * <br />
+ * <br>
* This is NOT a required initializer function. This is
* useful if you have already opened a pipe (or multiple files)
* that you wish to use, perhaps persistently across multiple
@@ -117,7 +117,7 @@ public class Procattr {
* @param attr The procattr describing the child process to be created.
* @param chk Flag to indicate whether or not extra work should be done
* to try to report failures to the caller.
- * <br />
+ * <br>
* This flag only affects apr_proc_create() on platforms where
* fork() is used. This leads to extra overhead in the calling
* process, but that may help the application handle such
@@ -140,7 +140,7 @@ public class Procattr {
* @param attr The procattr describing the child process to be created.
* @param pool The the pool to use.
* @param o The Object to call in the child process.
- * <br />
+ * <br>
* At the present time, it will only be called from apr_proc_create()
* on platforms where fork() is used. It will never be called on other
* platforms, on those platforms apr_proc_create() will return the error
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSLContext.java?rev=1671855&r1=1671854&r2=1671855&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSLContext.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSLContext.java Tue Apr 7
14:19:36 2015
@@ -63,7 +63,7 @@ public final class SSLContext {
/**
* Associate BIOCallback for input or output data capture.
- * <br />
+ * <br>
* First word in the output string will contain error
* level in the form:
* <PRE>
@@ -90,14 +90,21 @@ public final class SSLContext {
public static native void setOptions(long ctx, int options);
/**
+ * Clears OpenSSL Options.
+ * @param ctx Server or Client context to use.
+ * @param options See SSL.SSL_OP_* for option flags.
+ */
+ public static native void clearOptions(long ctx, int options);
+
+ /**
* Sets the "quiet shutdown" flag for <b>ctx</b> to be
* <b>mode</b>. SSL objects created from <b>ctx</b> inherit the
* <b>mode</b> valid at the time and may be 0 or 1.
- * <br />
+ * <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 />
+ * <br>
* When setting the "quiet shutdown" flag to 1, <b>SSL.shutdown</b>
* will set the internal flags to SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN.
* (<b>SSL_shutdown</b> then behaves like called with
@@ -112,7 +119,7 @@ public final class SSLContext {
/**
* Cipher Suite available for negotiation in SSL handshake.
- * <br />
+ * <br>
* This complex directive uses a colon-separated cipher-spec string
consisting
* of OpenSSL cipher specifications to configure the Cipher Suite the
client
* is permitted to negotiate in the SSL handshake phase. Notice that this
@@ -130,13 +137,13 @@ public final class SSLContext {
/**
* Set File of concatenated PEM-encoded CA CRLs or
* directory of PEM-encoded CA Certificates for Client Auth
- * <br />
+ * <br>
* This directive sets the all-in-one file where you can assemble the
* Certificate Revocation Lists (CRL) of Certification Authorities (CA)
* whose clients you deal with. These are used for Client Authentication.
* Such a file is simply the concatenation of the various PEM-encoded CRL
* files, in order of preference.
- * <br />
+ * <br>
* The files in this directory have to be PEM-encoded and are accessed
through
* hash filenames. So usually you can't just place the Certificate files
there:
* you also have to create symbolic links named hash-value.N. And you
should
@@ -152,14 +159,14 @@ public final class SSLContext {
/**
* Set File of PEM-encoded Server CA Certificates
- * <br />
+ * <br>
* This directive sets the optional all-in-one file where you can assemble
the
* certificates of Certification Authorities (CA) which form the
certificate
* chain of the server certificate. This starts with the issuing CA
certificate
* of of the server certificate and can range up to the root CA
certificate.
* Such a file is simply the concatenation of the various PEM-encoded CA
* Certificate files, usually in certificate chain order.
- * <br />
+ * <br>
* But be careful: Providing the certificate chain works only if you are
using
* a single (either RSA or DSA) based server certificate. If you are using
a
* coupled RSA+DSA certificate pair, this will work only if actually both
@@ -175,7 +182,7 @@ public final class SSLContext {
/**
* Set Certificate
- * <br />
+ * <br>
* 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
@@ -183,7 +190,7 @@ public final class SSLContext {
* 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.)
- * <br />
+ * <br>
* If the key is not combined with the certificate, use key param
* to point at the key file. Keep in mind that if
* you've both a RSA and a DSA private key you can configure
@@ -203,14 +210,14 @@ public final class SSLContext {
/**
* Set File and Directory of concatenated PEM-encoded CA Certificates
* for Client Auth
- * <br />
+ * <br>
* This directive sets the all-in-one file where you can assemble the
* Certificates of Certification Authorities (CA) whose clients you deal
with.
* These are used for Client Authentication. Such a file is simply the
* concatenation of the various PEM-encoded Certificate files, in order of
* preference. This can be used alternatively and/or additionally to
* path.
- * <br />
+ * <br>
* The files in this directory have to be PEM-encoded and are accessed
through
* hash filenames. So usually you can't just place the Certificate files
there:
* you also have to create symbolic links named hash-value.N. And you
should
@@ -234,7 +241,7 @@ public final class SSLContext {
/**
* Set SSL connection shutdown type
- * <br />
+ * <br>
* The following levels are available for level:
* <PRE>
* SSL_SHUTDOWN_TYPE_STANDARD
@@ -249,7 +256,7 @@ public final class SSLContext {
/**
* Set Type of Client Certificate verification and Maximum depth of CA
Certificates
* in Client Certificate verification.
- * <br />
+ * <br>
* This directive sets the Certificate verification level for the Client
* Authentication. Notice that this directive can be used both in
per-server
* and per-directory context. In per-server context it applies to the
client
@@ -257,7 +264,7 @@ public final class SSLContext {
* is established. In per-directory context it forces a SSL renegotiation
with
* the reconfigured client verification level after the HTTP request was
read
* but before the HTTP response is sent.
- * <br />
+ * <br>
* The following levels are available for level:
* <PRE>
* SSL_CVERIFY_NONE - No client Certificate is required at all
@@ -266,7 +273,7 @@ public final class SSLContext {
* SSL_CVERIFY_OPTIONAL_NO_CA - The client may present a valid Certificate
* but it need not to be (successfully)
verifiable
* </PRE>
- * <br />
+ * <br>
* The depth actually is the maximum number of intermediate certificate
issuers,
* i.e. the number of CA certificates which are max allowed to be followed
while
* verifying the client certificate. A depth of 0 means that self-signed
client
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java?rev=1671855&r1=1671854&r2=1671855&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java Tue Apr 7
14:19:36 2015
@@ -57,10 +57,10 @@ public class SSLSocket {
/**
* Set Type of Client Certificate verification and Maximum depth of CA
* Certificates in Client Certificate verification.
- * <br />
+ * <br>
* This is used to change the verification level for a connection prior to
* starting a re-negotiation.
- * <br />
+ * <br>
* The following levels are available for level:
* <PRE>
* SSL_CVERIFY_NONE - No client Certificate is required at all
@@ -71,7 +71,7 @@ public class SSLSocket {
* but it need not to be (successfully)
* verifiable
* </PRE>
- * <br />
+ * <br>
* @param sock The socket to change.
* @param level Type of Client Certificate verification.
*/
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Shm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Shm.java?rev=1671855&r1=1671854&r2=1671855&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Shm.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Shm.java Tue Apr 7
14:19:36 2015
@@ -27,15 +27,15 @@ public class Shm {
/**
* Create and make accessible a shared memory segment.
- * <br />
- * A note about Anonymous vs. Named shared memory segments:<br />
+ * <br>
+ * A note about Anonymous vs. Named shared memory segments:<br>
* Not all platforms support anonymous shared memory segments, but
in
* some cases it is preferred over other types of shared memory
* implementations. Passing a NULL 'file' parameter to this
function
* will cause the subsystem to use anonymous shared memory
segments.
* If such a system is not available, APR_ENOTIMPL is returned.
- * <br />
- * A note about allocation sizes:<br />
+ * <br>
+ * A note about allocation sizes:<br>
* On some platforms it is necessary to store some metainformation
* about the segment within the actual segment. In order to supply
* the caller with the requested size it may be necessary for the
@@ -55,7 +55,7 @@ public class Shm {
/**
* Remove shared memory segment associated with a filename.
- * <br />
+ * <br>
* This function is only supported on platforms which support
* name-based shared memory segments, and will return APR_ENOTIMPL on
* platforms without such support.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Socket.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Socket.java?rev=1671855&r1=1671854&r2=1671855&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Socket.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Socket.java Tue Apr 7
14:19:36 2015
@@ -117,7 +117,7 @@ public class Socket {
/**
* Shutdown either reading, writing, or both sides of a socket.
- * <br />
+ * <br>
* This does not actually close the socket descriptor, it just
* controls which calls are still valid on the socket.
* @param thesocket The socket to close
@@ -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);
@@ -499,7 +499,7 @@ public class Socket {
/**
* Send a file from an open file descriptor to a socket, along with
* optional headers and trailers.
- * <br />
+ * <br>
* This functions acts like a blocking write by default. To change
* this behavior, use apr_socket_timeout_set() or the
* APR_SO_NONBLOCK socket option.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Status.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Status.java?rev=1671855&r1=1671854&r2=1671855&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Status.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Status.java Tue Apr 7
14:19:36 2015
@@ -183,7 +183,7 @@ public class Status {
private static native boolean is(int err, int idx);
/**
* APR_STATUS_IS Status Value Tests
- * <br /><b>Warning :</b> For any particular error condition, more than
one of these tests
+ * <br><b>Warning :</b> For any particular error condition, more than one
of these tests
* may match. This is because platform-specific error codes may not
* always match the semantics of the POSIX codes these tests (and the
* corresponding APR error codes) are named after. A notable example
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Stdlib.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Stdlib.java?rev=1671855&r1=1671854&r2=1671855&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Stdlib.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Stdlib.java Tue Apr 7
14:19:36 2015
@@ -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();
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Time.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Time.java?rev=1671855&r1=1671854&r2=1671855&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Time.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Time.java Tue Apr 7
14:19:36 2015
@@ -64,7 +64,7 @@ public class Time {
/**
* Sleep for the specified number of micro-seconds.
- * <br /><b>Warning :</b> May sleep for longer than the specified time.
+ * <br><b>Warning :</b> May sleep for longer than the specified time.
* @param t desired amount of time to sleep.
*/
public static native void sleep(long t);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
