aboutsummaryrefslogtreecommitdiff
path: root/libjava/java
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/java')
-rw-r--r--libjava/java/io/ByteArrayOutputStream.java7
-rw-r--r--libjava/java/util/zip/ZipInputStream.java3
2 files changed, 5 insertions, 5 deletions
diff --git a/libjava/java/io/ByteArrayOutputStream.java b/libjava/java/io/ByteArrayOutputStream.java
index 5fba5c5..e72421e 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 3532096..a147b22 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