[commit-cp] Re: Patch: java.io.ObjectOutputStream

[Michael Koch]

Am Sonntag, 18. Juli 2004 16:48 schrieb Mark Wielaard:
> Hi,
>
> On Thu, 2004-07-15 at 14:17, Michael Koch wrote:
> > I commited the attached patch to merge java.io.ObjectOutputStream
> > with libgcj again.
> >
> >
> > 2004-07-15  Andrew Haley  <address@hidden>
> >
> >     * java/io/ObjectOutputStream.java: Add DEBUG statements
> >     everywhere.
> >     (dumpElementln): New method.
> >     (depth): New field.
>
> Which is nice.
>
> But this also adds:
> > @@ -318,6 +333,8 @@
> >
> >             if (obj instanceof Serializable)
> >               {
> > +               Object prevObject = this.currentObject;
> > +               ObjectStreamClass prevObjectStreamClass =
> > this.currentObjectStreamClass; currentObject = obj;
> >                 ObjectStreamClass[] hierarchy =
> >                  
> > ObjectStreamClass.getObjectStreamClasses(clazz);
> >
> > [...]
> >
> > -               currentObject = null;
> > -               currentObjectStreamClass = null;
> > +               this.currentObject = prevObject;
> > +               this.currentObjectStreamClass =
> > prevObjectStreamClass; currentPutField = null;
> >                 break;
> >               }
>
> If this was intended then this should also be mentioned in the
> ChangeLog. Could you see if this was also in the original patch
> that Andrew made to libgcj?

Thanks for reviewing. It was indeed not intended. I will revert this 
for now again and see later (next week) on how to merge with libgcj.


Michael