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 7ce832afd5e67e6f2d0e8c7b793a15c789558b70..05cdc8f26b1c36790dfcd5397b4fcb559532d88e 100644 (file)
--- 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 cef8a274266fd469098b3d8a790582c50e143cd2..6a5eed7a24c36c10a2aa64b056c9a4d15071e3fc 100644 (file)
--- 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;