/[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.43.2.13 by gnu_andrew, Tue Aug 2 20:12:19 2005 UTC revision 1.43.2.14 by gnu_andrew, Sun Aug 7 18:34:10 2005 UTC
# Line 964  public class ObjectInputStream extends I Line 964  public class ObjectInputStream extends I
964    {    {
965      if (this.readDataFromBlock)      if (this.readDataFromBlock)
966        {        {
967          if (this.blockDataPosition + length > this.blockDataBytes)          int remain = this.blockDataBytes - this.blockDataPosition;
968            {          if (remain == 0)
969              int remain = this.blockDataBytes - this.blockDataPosition;            {
970              if (remain != 0)              readNextBlock();
971                {              remain = this.blockDataBytes - this.blockDataPosition;
972                  System.arraycopy(this.blockData, this.blockDataPosition,            }
973                                   data, offset, remain);          length = Math.min(length, remain);
                 offset += remain;  
                 length -= remain;  
               }  
             readNextBlock ();  
           }  
   
974          System.arraycopy(this.blockData, this.blockDataPosition,          System.arraycopy(this.blockData, this.blockDataPosition,
975                           data, offset, length);                           data, offset, length);
976          this.blockDataPosition += length;          this.blockDataPosition += length;

Legend:
Removed from v.1.43.2.13  
changed lines
  Added in v.1.43.2.14

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