From 3b9bf6c68858d353b43b276dfb6708ab6344e9bf Mon Sep 17 00:00:00 2001 From: josch Date: Mon, 14 Feb 2011 03:36:24 +0100 Subject: [PATCH] fix IOUtils import and usage --- .../informatik/hets/common/net/HttpPostMultipart.java | 4 +++- .../informatik/hets/common/net/HttpPostUrlencoded.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/de/unibremen/informatik/hets/common/net/HttpPostMultipart.java b/src/de/unibremen/informatik/hets/common/net/HttpPostMultipart.java index e4f4bf4..3561d00 100644 --- a/src/de/unibremen/informatik/hets/common/net/HttpPostMultipart.java +++ b/src/de/unibremen/informatik/hets/common/net/HttpPostMultipart.java @@ -11,6 +11,8 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.FileInputStream; +import de.unibremen.informatik.hets.common.io.IOUtils; + public class HttpPostMultipart { URLConnection connection; OutputStream os = null; @@ -51,7 +53,7 @@ public class HttpPostMultipart { type = "application/octet-stream"; write("Content-Type: " + type + "\r\n"); write("\r\n"); - pipe(new FileInputStream((File)object), os); + IOUtils.copy(new FileInputStream((File)object), os); } else { write("\r\n"); write("\r\n"); diff --git a/src/de/unibremen/informatik/hets/common/net/HttpPostUrlencoded.java b/src/de/unibremen/informatik/hets/common/net/HttpPostUrlencoded.java index 72f9243..0626f06 100644 --- a/src/de/unibremen/informatik/hets/common/net/HttpPostUrlencoded.java +++ b/src/de/unibremen/informatik/hets/common/net/HttpPostUrlencoded.java @@ -11,6 +11,8 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.FileInputStream; +import de.unibremen.informatik.hets.common.io.IOUtils; + public class HttpPostUrlencoded { URLConnection connection; OutputStream os = null; @@ -38,7 +40,7 @@ public class HttpPostUrlencoded { write(name + "="); if (object instanceof File) { - write(URLEncoder.encode(InputStreamToString(new FileInputStream((File)object)), "UTF-8")); + write(URLEncoder.encode(IOUtils.getString(new FileInputStream((File)object)), "UTF-8")); } else { write(object.toString()); }