/[classpath]/classpath/java/io/ObjectInputStream.java
ViewVC logotype

Diff of /classpath/java/io/ObjectInputStream.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.44 by mark, Thu Sep 9 18:20:55 2004 UTC revision 1.45 by mkoch, Fri Sep 24 10:26:33 2004 UTC
# Line 51  import java.util.Arrays; Line 51  import java.util.Arrays;
51  import java.util.Hashtable;  import java.util.Hashtable;
52  import java.util.Vector;  import java.util.Vector;
53    
   
54  public class ObjectInputStream extends InputStream  public class ObjectInputStream extends InputStream
55    implements ObjectInput, ObjectStreamConstants    implements ObjectInput, ObjectStreamConstants
56  {  {
# Line 300  public class ObjectInputStream extends I Line 299  public class ObjectInputStream extends I
299                Object obj = newObject(clazz, osc.firstNonSerializableParent);                Object obj = newObject(clazz, osc.firstNonSerializableParent);
300                                
301                int handle = assignNewHandle(obj);                int handle = assignNewHandle(obj);
302                  Object prevObject = this.currentObject;
303                  ObjectStreamClass prevObjectStreamClass = this.currentObjectStreamClass;
304                  
305                this.currentObject = obj;                this.currentObject = obj;
306                ObjectStreamClass[] hierarchy =                ObjectStreamClass[] hierarchy =
307                  inputGetObjectStreamClasses(clazz);                  inputGetObjectStreamClasses(clazz);
# Line 347  public class ObjectInputStream extends I Line 349  public class ObjectInputStream extends I
349                      }                      }
350                  }                  }
351    
352                this.currentObject = null;                this.currentObject = prevObject;
353                this.currentObjectStreamClass = null;                this.currentObjectStreamClass = prevObjectStreamClass;
354                ret_val = processResolution(osc, obj, handle);                ret_val = processResolution(osc, obj, handle);
355                                        
356                break;                break;

Legend:
Removed from v.1.44  
changed lines
  Added in v.1.45

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26