From 3e6716343e69622f4a0b3a15cf23c93249b4ea2b Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 6 Nov 2004 22:56:38 +0000
Subject: [PATCH] * java/io/ObjectOutputStream.java
(currentObjectStreamClass): Now package-private.
(setBlockDataMode): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90198 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 6 ++++++
libjava/java/io/ObjectOutputStream.java | 6 ++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7ce832afd5e6..05cdc8f26b1c 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+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
diff --git a/libjava/java/io/ObjectOutputStream.java b/libjava/java/io/ObjectOutputStream.java
index cef8a274266f..6a5eed7a24c3 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;
--
GitLab