From: Tom Tromey <tromey@redhat.com>
Date: Sat, 6 Nov 2004 22:56:38 +0000 (+0000)
Subject: ObjectOutputStream.java (currentObjectStreamClass): Now package-private.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7771b8da335a758fac6296f34f164c82470cf6d3;p=gcc.git

ObjectOutputStream.java (currentObjectStreamClass): Now package-private.

	* java/io/ObjectOutputStream.java (currentObjectStreamClass): Now
	package-private.
	(setBlockDataMode): Likewise.

From-SVN: r90198
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7ce832afd5e..05cdc8f26b1 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 cef8a274266..6a5eed7a24c 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;