Index: src/java/org/apache/commons/httpclient/methods/MultipartPostMethod.java
===================================================================
RCS file: /home/cvspublic/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/MultipartPostMethod.java,v
retrieving revision 1.2
diff -u -r1.2 MultipartPostMethod.java
--- src/java/org/apache/commons/httpclient/methods/MultipartPostMethod.java 11 Oct 2002 05:16:32 -0000 1.2
+++ src/java/org/apache/commons/httpclient/methods/MultipartPostMethod.java 30 Oct 2002 23:14:57 -0000
@@ -71,17 +71,23 @@
import java.io.FileNotFoundException;
import org.apache.commons.httpclient.*;
import org.apache.commons.httpclient.methods.multipart.*;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* POST Method for Multipart encoded forms.
*
* @author Matthew Albright
* @author Jeff Dever
+ * @author Adrian Sutton
*
* @since 2.0
*/
public class MultipartPostMethod extends GetMethod {
+ /** Log object for this class. */
+ private static final Log log = LogFactory.getLog(MultipartPostMethod.class);
+
private List parameters = new ArrayList();
/**
@@ -131,12 +137,14 @@
* Clear my request body.
*/
public void recycle() {
+ log.trace("enter recycle()");
super.recycle();
parameters.clear();
}
public void addParameter(String parameterName, String parameterValue) {
+ log.trace("enter addParameter(String parameterName, String parameterValue)");
Part param = new StringPart(parameterName, parameterValue);
parameters.add(param);
}
@@ -144,6 +152,7 @@
public void addParameter(String parameterName, File parameterFile)
throws FileNotFoundException {
+ log.trace("enter addParameter(String parameterName, File parameterFile)");
Part param = new FilePart(parameterName, parameterFile);
parameters.add(param);
}
@@ -152,11 +161,13 @@
* Adds another part to this post.
*/
public void addPart( Part part ) {
+ log.trace("enter addPart(Part part)");
parameters.add(part);
}
protected void addRequestHeaders(HttpState state, HttpConnection conn)
throws IOException, HttpException {
+ log.trace("enter addRequestHeaders(HttpState state, HttpConnection conn)");
super.addRequestHeaders(state,conn);
if (! parameters.isEmpty())
@@ -173,6 +184,7 @@
*/
protected boolean writeRequestBody(HttpState state, HttpConnection conn)
throws IOException, HttpException {
+ log.trace("enter writeRequestBody(HttpState state, HttpConnection conn)");
OutputStream out = conn.getRequestOutputStream();
for (Iterator it = parameters.iterator(); it.hasNext();) {
@@ -181,9 +193,9 @@
}
Part.sendLastBoundary(out);
+
+ out.flush();
- out.close();
-
return true;
}
@@ -196,6 +208,7 @@
* until I am {@link #recycle recycled}.
*/
protected int getRequestContentLength() {
+ log.trace("enter getRequestContentLength()");
long length = 0;
try {