diff options
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/io/ObjectOutputStream.java | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7ce832a..05cdc8f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,11 @@ 2004-11-06 Tom Tromey <tromey@redhat.com> + * java/io/ObjectOutputStream.java (currentObjectStreamClass): Now + package-private. + (setBlockDataMode): Likewise. + +2004-11-06 Tom Tromey <tromey@redhat.com> + * gnu/java/nio/charset/ISO_8859_1.java (Decoder): Now package-private. (Encoder): Likewise. diff --git a/libjava/java/io/ObjectOutputStream.java b/libjava/java/io/ObjectOutputStream.java index cef8a27..6a5eed7 100644 --- a/libjava/java/io/ObjectOutputStream.java +++ b/libjava/java/io/ObjectOutputStream.java @@ -1239,7 +1239,8 @@ public class ObjectOutputStream extends OutputStream // Toggles writing primitive data to block-data buffer. - private boolean setBlockDataMode(boolean on) throws IOException + // Package-private to avoid a trampoline constructor. + boolean setBlockDataMode(boolean on) throws IOException { if (on == writeDataAsBlocks) return on; @@ -1563,7 +1564,8 @@ public class ObjectOutputStream extends OutputStream private byte[] blockData; private int blockDataCount; private Object currentObject; - private ObjectStreamClass currentObjectStreamClass; + // Package-private to avoid a trampoline. + ObjectStreamClass currentObjectStreamClass; private PutField currentPutField; private boolean fieldsAlreadyWritten; private boolean replacementEnabled; |