aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2000-08-19 19:54:36 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2000-08-19 19:54:36 +0000
commiteb415f539deb67c23f4ad326770b90f5d4156303 (patch)
tree61385d572e25abc6269c04d4671da19bd1fe5c2d
parent121fbaa55ea2cfc6316c95d38eaa0db137de793d (diff)
* java/util/zip/ZipInputStream.java (createZipEntry):
Implemented. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35810 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/io/ByteArrayOutputStream.java7
-rw-r--r--libjava/java/util/zip/ZipInputStream.java3
3 files changed, 10 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4ca76d32785..2638d0d7b53 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-19 Tom Tromey <tromey@cygnus.com>
+
+ * java/util/zip/ZipInputStream.java (createZipEntry):
+ Implemented.
+
Sat Aug 19 11:00:53 2000 Anthony Green <green@redhat.com>
* java/util/jar/Attributes.java, java/util/jar/JarEntry.java,
diff --git a/libjava/java/io/ByteArrayOutputStream.java b/libjava/java/io/ByteArrayOutputStream.java
index 5fba5c59180..e72421e0d38 100644
--- a/libjava/java/io/ByteArrayOutputStream.java
+++ b/libjava/java/io/ByteArrayOutputStream.java
@@ -247,10 +247,11 @@ public class ByteArrayOutputStream extends OutputStream
static
{
- initial_buffer_size
+ int r
= Integer.getInteger ("gnu.java.io.ByteArrayOutputStream.initialBufferSize",
DEFAULT_INITIAL_BUFFER_SIZE).intValue ();
- if (initial_buffer_size <= 0)
- initial_buffer_size = DEFAULT_INITIAL_BUFFER_SIZE;
+ if (r <= 0)
+ r = DEFAULT_INITIAL_BUFFER_SIZE;
+ initial_buffer_size = r;
}
}
diff --git a/libjava/java/util/zip/ZipInputStream.java b/libjava/java/util/zip/ZipInputStream.java
index 35320961982..a147b228a69 100644
--- a/libjava/java/util/zip/ZipInputStream.java
+++ b/libjava/java/util/zip/ZipInputStream.java
@@ -125,8 +125,7 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
protected ZipEntry createZipEntry (String name)
{
- // FIXME - must figure out what this is supposed to do.
- return null;
+ return new ZipEntry (name);
}
public int read (byte[] b, int off, int len) throws IOException