2003-06-25 Michael Koch <konqueror@gmx.de>

	* java/io/ObjectInputStream.java
	(readClassDescriptor): New method.
	(readObject): Moved functionality to readClassDescriptor().
	* java/io/ObjectOutputStream.java
	(writeClassDescriptor): New method.
	(writeObject): Moved functionality to writeClassDescriptor().


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@68465 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 41 insertions, 40 deletions

diff --git a/libjava/java/io/ObjectOutputStream.java b/libjava/java/io/ObjectOutputStream.java
index cb461231b33..da01b57ba8d 100644
--- a/libjava/java/io/ObjectOutputStream.java
+++ b/libjava/java/io/ObjectOutputStream.java
@@ -224,46 +224,7 @@ public class ObjectOutputStream extends OutputStream
 	      }
 
 	    if (obj instanceof ObjectStreamClass)
-	      {
-		ObjectStreamClass osc = (ObjectStreamClass)obj;
-		realOutput.writeByte (TC_CLASSDESC);
-		realOutput.writeUTF (osc.getName ());
-		realOutput.writeLong (osc.getSerialVersionUID ());
-		assignNewHandle (obj);
-
-		int flags = osc.getFlags ();
-
-		if (protocolVersion == PROTOCOL_VERSION_2
-		    && osc.isExternalizable ())
-		  flags |= SC_BLOCK_DATA;
-
-		realOutput.writeByte (flags);
-
-		ObjectStreamField[] fields = osc.fields;
-		realOutput.writeShort (fields.length);
-
-		ObjectStreamField field;
-		for (int i=0; i < fields.length; i++)
-		  {
-		    field = fields[i];
-		    realOutput.writeByte (field.getTypeCode ());
-		    realOutput.writeUTF (field.getName ());
-
-		    if (! field.isPrimitive ())
-		      writeObject (field.getTypeString ());
-		  }
-
-		boolean oldmode = setBlockDataMode (true);
-		annotateClass (osc.forClass ());
-		setBlockDataMode (oldmode);
-		realOutput.writeByte (TC_ENDBLOCKDATA);
-
-		if (osc.isSerializable ())
-		  writeObject (osc.getSuper ());
-		else
-		  writeObject (null);
-		break;
-	      }
+	      writeClassDescriptor ((ObjectStreamClass) obj);
 
 	    if ((replacementEnabled || obj instanceof Serializable)
 		&& ! replaceDone)
@@ -406,6 +367,46 @@ public class ObjectOutputStream extends OutputStream
       }
   }
 
+  protected void writeClassDescriptor (ObjectStreamClass osc) throws IOException
+  {
+    realOutput.writeByte (TC_CLASSDESC);
+    realOutput.writeUTF (osc.getName ());
+    realOutput.writeLong (osc.getSerialVersionUID ());
+    assignNewHandle (osc);
+
+    int flags = osc.getFlags ();
+
+    if (protocolVersion == PROTOCOL_VERSION_2
+	&& osc.isExternalizable ())
+      flags |= SC_BLOCK_DATA;
+
+    realOutput.writeByte (flags);
+
+    ObjectStreamField[] fields = osc.fields;
+    realOutput.writeShort (fields.length);
+
+    ObjectStreamField field;
+    for (int i=0; i < fields.length; i++)
+      {
+	field = fields[i];
+	realOutput.writeByte (field.getTypeCode ());
+	realOutput.writeUTF (field.getName ());
+
+	if (! field.isPrimitive ())
+	  writeObject (field.getTypeString ());
+      }
+
+    boolean oldmode = setBlockDataMode (true);
+    annotateClass (osc.forClass ());
+    setBlockDataMode (oldmode);
+    realOutput.writeByte (TC_ENDBLOCKDATA);
+
+    if (osc.isSerializable ())
+      writeObject (osc.getSuper ());
+    else
+      writeObject (null);
+  }
+  
   /**
      Writes the current objects non-transient, non-static fields from
      the current class to the underlying output stream.