You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by se...@apache.org on 2014/08/29 01:09:14 UTC
svn commit: r1621225 [2/2] - in /httpcomponents:
httpasyncclient/trunk/httpasyncclient-cache/src/test/java/org/apache/http/impl/client/cache/
httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/
httpasyncclient/trunk/htt...
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/AbstractConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/AbstractConnPool.java?rev=1621225&r1=1621224&r2=1621225&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/AbstractConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/AbstractConnPool.java Thu Aug 28 23:09:12 2014
@@ -47,7 +47,7 @@ import org.apache.http.util.Asserts;
/**
* Abstract synchronous (blocking) pool of connections.
- * <p/>
+ * <p>
* Please note that this class does not maintain its own pool of execution {@link Thread}s.
* Therefore, one <b>must</b> call {@link Future#get()} or {@link Future#get(long, TimeUnit)}
* method on the {@link Future} object returned by the
@@ -166,7 +166,7 @@ public abstract class AbstractConnPool<T
/**
* {@inheritDoc}
- * <p/>
+ * <p>
* Please note that this class does not maintain its own pool of execution
* {@link Thread}s. Therefore, one <b>must</b> call {@link Future#get()}
* or {@link Future#get(long, TimeUnit)} method on the {@link Future}
@@ -194,7 +194,7 @@ public abstract class AbstractConnPool<T
/**
* Attempts to lease a connection for the given route and with the given
* state from the pool.
- * <p/>
+ * <p>
* Please note that this class does not maintain its own pool of execution
* {@link Thread}s. Therefore, one <b>must</b> call {@link Future#get()}
* or {@link Future#get(long, TimeUnit)} method on the {@link Future}
@@ -451,6 +451,7 @@ public abstract class AbstractConnPool<T
/**
* Returns snapshot of all knows routes
+ * @return the set of routes
*
* @since 4.4
*/
@@ -560,6 +561,7 @@ public abstract class AbstractConnPool<T
}
/**
+ * @return the number of milliseconds
* @since 4.4
*/
public int getValidateAfterInactivity() {
@@ -567,6 +569,7 @@ public abstract class AbstractConnPool<T
}
/**
+ * @param ms the number of milliseconds
* @since 4.4
*/
public void setValidateAfterInactivity(final int ms) {
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/PoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/PoolEntry.java?rev=1621225&r1=1621224&r2=1621225&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/PoolEntry.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/PoolEntry.java Thu Aug 28 23:09:12 2014
@@ -34,11 +34,11 @@ import org.apache.http.util.Args;
/**
* Pool entry containing a pool connection object along with its route.
- * <p/>
+ * <p>
* The connection contained by the pool entry may have an expiration time which
* can be either set upon construction time or updated with
* the {@link #updateExpiry(long, TimeUnit)}.
- * <p/>
+ * <p>
* Pool entry may also have an object associated with it that represents
* a connection state (usually a security principal or a unique token identifying
* the user whose credentials have been used while establishing the connection).
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpContext.java?rev=1621225&r1=1621224&r2=1621225&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpContext.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpContext.java Thu Aug 28 23:09:12 2014
@@ -30,7 +30,7 @@ package org.apache.http.protocol;
/**
* HttpContext represents execution state of an HTTP process. It is a structure
* that can be used to map an attribute name to an attribute value.
- * <p/>
+ * <p>
* The primary purpose of the HTTP context is to facilitate information sharing
* among various logically related components. HTTP context can be used
* to store a processing state for one message or several consecutive messages.
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java?rev=1621225&r1=1621224&r2=1621225&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java Thu Aug 28 23:09:12 2014
@@ -44,7 +44,7 @@ import org.apache.http.util.Args;
/**
* {@code HttpRequestExecutor} is a client side HTTP protocol handler based
* on the blocking (classic) I/O model.
- * <p/>
+ * <p>
* {@code HttpRequestExecutor} relies on {@link HttpProcessor} to generate
* mandatory protocol headers for all outgoing messages and apply common,
* cross-cutting message transformations to all incoming and outgoing messages.
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java?rev=1621225&r1=1621224&r2=1621225&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java Thu Aug 28 23:09:12 2014
@@ -54,17 +54,17 @@ import org.apache.http.util.EntityUtils;
/**
* {@code HttpService} is a server side HTTP protocol handler based on
* the classic (blocking) I/O model.
- * <p/>
+ * <p>
* {@code HttpService} relies on {@link HttpProcessor} to generate mandatory
* protocol headers for all outgoing messages and apply common, cross-cutting
* message transformations to all incoming and outgoing messages, whereas
* individual {@link HttpRequestHandler}s are expected to implement
* application specific content generation and processing.
- * <p/>
+ * <p>
* {@code HttpService} uses {@link HttpRequestHandlerMapper} to map
* matching request handler for a particular request URI of an incoming HTTP
* request.
- * <p/>
+ * <p>
* {@code HttpService} can use optional {@link HttpExpectationVerifier}
* to ensure that incoming requests meet server's expectations.
*
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/VersionInfo.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/VersionInfo.java?rev=1621225&r1=1621224&r2=1621225&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/VersionInfo.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/VersionInfo.java Thu Aug 28 23:09:12 2014
@@ -302,7 +302,7 @@ public class VersionInfo {
/**
* Sets the user agent to {@code "<name>/<release> (Java 1.5 minimum; Java/<java.version>)"}.
- * <p/>
+ * <p>
* For example:
* <pre>"Apache-HttpClient/4.3 (Java 1.5 minimum; Java/1.6.0_35)"</pre>
*