diff --git a/src/java/com/threerings/resource/ResourceBundle.java b/src/java/com/threerings/resource/ResourceBundle.java index 1c55bf2fe..f67951243 100644 --- a/src/java/com/threerings/resource/ResourceBundle.java +++ b/src/java/com/threerings/resource/ResourceBundle.java @@ -1,5 +1,5 @@ // -// $Id: ResourceBundle.java,v 1.28 2004/07/03 03:21:05 mdb Exp $ +// $Id: ResourceBundle.java,v 1.29 2004/07/13 16:37:40 mdb Exp $ package com.threerings.resource; @@ -19,7 +19,7 @@ import com.samskivert.io.StreamUtil; import com.samskivert.util.FileUtil; import com.samskivert.util.StringUtil; -import org.apache.commons.io.StreamUtils; +import org.apache.commons.io.CopyUtils; /** * A resource bundle provides access to the resources in a jar file. @@ -148,7 +148,7 @@ public class ResourceBundle fout = new BufferedOutputStream( new FileOutputStream(efile)); jin = _jarSource.getInputStream(entry); - StreamUtils.pipe(jin, fout); + CopyUtils.copy(jin, fout); } catch (Exception e) { Log.warning("Failure unpacking " + efile + ": " + e); failure = true; @@ -280,7 +280,7 @@ public class ResourceBundle BufferedOutputStream fout = new BufferedOutputStream(new FileOutputStream(tfile)); InputStream jin = _jarSource.getInputStream(entry); - StreamUtils.pipe(jin, fout); + CopyUtils.copy(jin, fout); jin.close(); fout.close(); diff --git a/src/java/com/threerings/resource/ResourceManager.java b/src/java/com/threerings/resource/ResourceManager.java index 88cabb127..6ab065a5e 100644 --- a/src/java/com/threerings/resource/ResourceManager.java +++ b/src/java/com/threerings/resource/ResourceManager.java @@ -1,5 +1,5 @@ // -// $Id: ResourceManager.java,v 1.42 2004/06/18 17:41:39 mdb Exp $ +// $Id: ResourceManager.java,v 1.43 2004/07/13 16:37:40 mdb Exp $ package com.threerings.resource; @@ -28,7 +28,7 @@ import javax.imageio.stream.FileImageInputStream; import javax.imageio.stream.ImageInputStream; import javax.imageio.stream.MemoryCacheImageInputStream; -import org.apache.commons.io.StreamUtils; +import org.apache.commons.io.CopyUtils; import com.samskivert.util.ResultListener; import com.samskivert.util.StringUtil; @@ -299,7 +299,7 @@ public class ResourceManager try { if (curl != null) { // download the properties file into a buffer - StreamUtils.pipe(curl.openStream(), bout); + CopyUtils.copy(curl.openStream(), bout); config.load(new ByteArrayInputStream(bout.toByteArray())); }