mbecke 2003/10/03 19:31:26
Modified: httpclient/src/java/org/apache/commons/httpclient/auth Tag:
HTTPCLIENT_2_0_BRANCH DigestScheme.java
httpclient/src/java/org/apache/commons/httpclient/cookie
Tag: HTTPCLIENT_2_0_BRANCH CookieSpec.java
RFC2109Spec.java
httpclient/src/java/org/apache/commons/httpclient Tag:
HTTPCLIENT_2_0_BRANCH ConnectMethod.java
ChunkedInputStream.java HttpMethodBase.java
httpclient/src/java/org/apache/commons/httpclient/methods
Tag: HTTPCLIENT_2_0_BRANCH TraceMethod.java
EntityEnclosingMethod.java
Log:
A few style corrections.
Revision Changes Path
No revision
No revision
1.4.2.4 +5 -3
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/auth/DigestScheme.java
Index: DigestScheme.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/auth/DigestScheme.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- DigestScheme.java 11 Sep 2003 09:04:35 -0000 1.4.2.3
+++ DigestScheme.java 4 Oct 2003 02:31:25 -0000 1.4.2.4
@@ -107,6 +107,8 @@
* Gets an ID based upon the realm and the nonce value. This ensures that
requests
* to the same realm with different nonce values will succeed. This
differentiation
* allows servers to request re-authentication using a fresh nonce value.
+ *
+ * @return the realm plus the nonce value, if present
*/
public String getID() {
No revision
No revision
1.6.2.1 +5 -5
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/cookie/CookieSpec.java
Index: CookieSpec.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/cookie/CookieSpec.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- CookieSpec.java 27 Jan 2003 15:25:47 -0000 1.6
+++ CookieSpec.java 4 Oct 2003 02:31:25 -0000 1.6.2.1
@@ -85,10 +85,10 @@
public interface CookieSpec {
/** Path delimiter */
- static final String PATH_DELIM = "/";
+ String PATH_DELIM = "/";
/** Path delimiting charachter */
- static final char PATH_DELIM_CHAR = PATH_DELIM.charAt(0);
+ char PATH_DELIM_CHAR = PATH_DELIM.charAt(0);
/**
* Parse the <tt>"Set-Cookie"</tt> header value into Cookie array.
1.14.2.1 +4 -5
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/cookie/RFC2109Spec.java
Index: RFC2109Spec.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/cookie/RFC2109Spec.java,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- RFC2109Spec.java 26 May 2003 17:58:03 -0000 1.14
+++ RFC2109Spec.java 4 Oct 2003 02:31:25 -0000 1.14.2.1
@@ -124,8 +124,7 @@
}
cookie.setPath(paramValue);
cookie.setPathAttributeSpecified(true);
- }
- else if (paramName.equals("version")) {
+ } else if (paramName.equals("version")) {
if (paramValue == null) {
throw new MalformedCookieException(
No revision
No revision
1.18.2.1 +10 -8
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/ConnectMethod.java
Index: ConnectMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/ConnectMethod.java,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- ConnectMethod.java 12 Jun 2003 18:38:59 -0000 1.18
+++ ConnectMethod.java 4 Oct 2003 02:31:26 -0000 1.18.2.1
@@ -271,10 +271,12 @@
* Returns <code>true</code> if the status code is anything other than
* SC_OK, <code>false</code> otherwise.
*
- * @see HttpMethodBase#shouldCloseConnection(HttpConnection)
- * @see HttpStatus#SC_OK
+ * @param conn the connection to test
*
* @return <code>true</code> if the connection should be closed
+ *
+ * @see HttpMethodBase#shouldCloseConnection(HttpConnection)
+ * @see HttpStatus#SC_OK
*/
protected boolean shouldCloseConnection(HttpConnection conn) {
if (getStatusCode() == HttpStatus.SC_OK) {
@@ -288,8 +290,8 @@
if (connectionHeader != null) {
if (connectionHeader.getValue().equalsIgnoreCase("close")) {
if (LOG.isWarnEnabled()) {
- LOG.warn("Invalid header encountered '" +
connectionHeader.toExternalForm() +
- "' in response " + getStatusLine().toString());
+ LOG.warn("Invalid header encountered '" +
connectionHeader.toExternalForm()
+ + "' in response " + getStatusLine().toString());
}
}
}
1.16.2.1 +3 -5
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/ChunkedInputStream.java
Index: ChunkedInputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/ChunkedInputStream.java,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -r1.16 -r1.16.2.1
--- ChunkedInputStream.java 8 May 2003 17:33:51 -0000 1.16
+++ ChunkedInputStream.java 4 Oct 2003 02:31:26 -0000 1.16.2.1
@@ -249,8 +249,6 @@
* comment\r\n" Positions the stream at the start of the next line.
*
* @param in The new input stream.
- * @param required <tt>true<tt/> if a valid chunk must be present,
- * <tt>false<tt/> otherwise.
*
* @return the chunk size as integer
*
1.159.2.10 +7 -7
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethodBase.java
Index: HttpMethodBase.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethodBase.java,v
retrieving revision 1.159.2.9
retrieving revision 1.159.2.10
diff -u -r1.159.2.9 -r1.159.2.10
--- HttpMethodBase.java 3 Sep 2003 02:21:24 -0000 1.159.2.9
+++ HttpMethodBase.java 4 Oct 2003 02:31:26 -0000 1.159.2.10
@@ -2026,8 +2026,8 @@
if (transferEncodingHeader != null) {
String transferEncoding = transferEncodingHeader.getValue();
- if (!"chunked".equalsIgnoreCase(transferEncoding) &&
- !"identity".equalsIgnoreCase(transferEncoding)) {
+ if (!"chunked".equalsIgnoreCase(transferEncoding)
+ && !"identity".equalsIgnoreCase(transferEncoding)) {
if (LOG.isWarnEnabled()) {
LOG.warn("Unsupported transfer encoding: " + transferEncoding);
}
@@ -2036,7 +2036,7 @@
// The chunck encoding must be the last one applied
// RFC2616, 14.41
int len = encodings.length;
- if ((len > 0) && ("chunked".equalsIgnoreCase(encodings[len -
1].getName() ))) {
+ if ((len > 0) && ("chunked".equalsIgnoreCase(encodings[len -
1].getName()))) {
// if response body is empty
if (conn.isResponseAvailable(conn.getSoTimeout())) {
result = new ChunkedInputStream(is, this);
No revision
No revision
1.12.2.2 +3 -3
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/TraceMethod.java
Index: TraceMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/TraceMethod.java,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -r1.12.2.1 -r1.12.2.2
1.18.2.2 +6 -6
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/EntityEnclosingMethod.java
Index: EntityEnclosingMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/EntityEnclosingMethod.java,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -r1.18.2.1 -r1.18.2.2
--- EntityEnclosingMethod.java 9 Aug 2003 19:36:39 -0000 1.18.2.1
+++ EntityEnclosingMethod.java 4 Oct 2003 02:31:26 -0000 1.18.2.2
@@ -338,8 +338,8 @@
LOG.trace("enter HttpMethodBase.addContentLengthRequestHeader("
+ "HttpState, HttpConnection)");
- if ((getRequestHeader("content-length") == null) &&
- (getRequestHeader("Transfer-Encoding") == null)) {
+ if ((getRequestHeader("content-length") == null)
+ && (getRequestHeader("Transfer-Encoding") == null)) {
int len = getRequestContentLength();
if (len >= 0) {
addRequestHeader("Content-Length", String.valueOf(len));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
