rwaldhoff 01/08/13 10:54:27
Modified: httpclient/src/java/org/apache/commons/httpclient Tag:
rlwrefactoring HttpMethodBase.java
httpclient/src/java/org/apache/commons/httpclient/methods
Tag: rlwrefactoring PutMethod.java
Log:
removing needExpectation method, moving expection responsibilities down to PutMethod
Revision Changes Path
No revision
No revision
1.10.2.6 +4 -17
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.10.2.5
retrieving revision 1.10.2.6
diff -u -r1.10.2.5 -r1.10.2.6
--- HttpMethodBase.java 2001/08/13 17:38:56 1.10.2.5
+++ HttpMethodBase.java 2001/08/13 17:54:27 1.10.2.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethodBase.java,v
1.10.2.5 2001/08/13 17:38:56 rwaldhoff Exp $
- * $Revision: 1.10.2.5 $
- * $Date: 2001/08/13 17:38:56 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethodBase.java,v
1.10.2.6 2001/08/13 17:54:27 rwaldhoff Exp $
+ * $Revision: 1.10.2.6 $
+ * $Date: 2001/08/13 17:54:27 $
* ====================================================================
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
@@ -65,10 +65,6 @@
return 0;
}
- protected boolean needExpectation() {
- return false;
- }
-
protected void writeRequestBody(State state, HttpConnection conn) throws
IOException, HttpException {
bodySent = true;
return;
@@ -382,9 +378,7 @@
writeRequestLine(state,conn);
writeRequestHeaders(state,conn);
conn.writeLine(); // close head
- if(!needExpectation()) {
- writeRequestBody(state,conn);
- }
+ writeRequestBody(state,conn);
}
protected void readResponse(State state, HttpConnection conn) throws
IOException, HttpException {
@@ -668,13 +662,6 @@
if (challengeResponse != null) {
setRequestHeader("Authorization",challengeResponse);
}
- }
- }
-
- // Send expectation header
- if(!requestHeaders.containsKey("expect")) {
- if(needExpectation()) {
- setRequestHeader("Expect","100-continue");
}
}
}
No revision
No revision
1.3.2.3 +15 -7
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/PutMethod.java
Index: PutMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/PutMethod.java,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- PutMethod.java 2001/08/13 16:01:05 1.3.2.2
+++ PutMethod.java 2001/08/13 17:54:27 1.3.2.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/PutMethod.java,v
1.3.2.2 2001/08/13 16:01:05 rwaldhoff Exp $
- * $Revision: 1.3.2.2 $
- * $Date: 2001/08/13 16:01:05 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/PutMethod.java,v
1.3.2.3 2001/08/13 17:54:27 rwaldhoff Exp $
+ * $Revision: 1.3.2.3 $
+ * $Date: 2001/08/13 17:54:27 $
*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
@@ -28,6 +28,7 @@
import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpMethodBase;
import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.HttpStatus;
/**
@@ -184,7 +185,18 @@
// ----------------------------------------------------- HttpMethod Methods
+ protected void generateRequestHeaders(State state, HttpConnection conn) throws
IOException, HttpException {
+ super.generateRequestHeaders(state,conn);
+ // Send expectation header
+ if(http11 && !requestHeaders.containsKey("expect")) {
+ setRequestHeader("Expect","100-continue");
+ }
+ }
+
protected void writeRequestBody(State state, HttpConnection conn) throws
IOException, HttpException {
+ if(requestHeaders.containsKey("expect") && statusCode !=
HttpStatus.SC_CONTINUE) {
+ return;
+ }
RequestOutputStream out = conn.getRequestOutputStream();
if((http11) && (getRequestHeader("Content-Length") == null)) {
out.setUseChunking(true);
@@ -233,9 +245,5 @@
data = null;
url = null;
file = null;
- }
-
- public boolean needExpectation() {
- return true;
}
}
