[Beepcore-java-commits] CVS: beepcore-java/src/org/beepcore/beep/transport/tcp TCPSession.java,1.31,1.32

[Huston F. <hu...@us...>]

Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/transport/tcp
In directory sc8-pr-cvs1:/tmp/cvs-serv7426/src/org/beepcore/beep/transport/tcp

Modified Files:
	TCPSession.java 
Log Message:
more windowing cleanup

Index: TCPSession.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/transport/tcp/TCPSession.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** TCPSession.java	27 May 2003 21:38:01 -0000	1.31
--- TCPSession.java	3 Jun 2003 02:41:23 -0000	1.32
***************
*** 3,7 ****
   *
   * Copyright (c) 2001 Invisible Worlds, Inc.  All rights reserved.
!  * Copyright (c) 2001,2002 Huston Franklin.  All rights reserved.
   *
   * The contents of this file are subject to the Blocks Public License (the
--- 3,7 ----
   *
   * Copyright (c) 2001 Invisible Worlds, Inc.  All rights reserved.
!  * Copyright (c) 2001-2003 Huston Franklin.  All rights reserved.
   *
   * The contents of this file are subject to the Blocks Public License (the
***************
*** 378,385 ****
              throws BEEPException
      {
-         // If IO is disabled don't send SEQ
-         if (running == false)
-             return false;
- 
          StringBuffer sb = new StringBuffer(Frame.MAX_HEADER_SIZE);
  
--- 378,381 ----
***************
*** 449,453 ****
                      continue;
                  } else {
!                     processCoreFrame(headerBuffer, amountRead, is);
                  }
              }
--- 445,452 ----
                      continue;
                  } else {
!                     if (processCoreFrame(headerBuffer, amountRead, is) == false)
!                     {
!                         break;
!                     }
                  }
              }
***************
*** 471,476 ****
      }
  
!     private void processCoreFrame(byte[] headerBuffer, int amountRead,
!                                   InputStream is)
          throws SessionAbortedException, BEEPException, IOException
      {
--- 470,475 ----
      }
  
!     private boolean processCoreFrame(byte[] headerBuffer, int amountRead,
!                                      InputStream is)
          throws SessionAbortedException, BEEPException, IOException
      {
***************
*** 502,506 ****
                  // socket closed intentionally (session closing)
                  // so just return
!                 return;
              }
  
--- 501,505 ----
                  // socket closed intentionally (session closing)
                  // so just return
!                 return false;
              }
  
***************
*** 598,602 ****
  
          f.addPayload(new BufferSegment(payload));
!         super.postFrame(f);
      }
  
--- 597,602 ----
  
          f.addPayload(new BufferSegment(payload));
! 
!         return super.postFrame(f);
      }