[Beepcore-java-commits] CVS: beepcore-java/src/org/beepcore/beep/core Session.java,1.26,1.27

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

Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core
In directory usw-pr-cvs1:/tmp/cvs-serv31080/src/org/beepcore/beep/core

Modified Files:
	Session.java 
Log Message:
more state cleanup

Index: Session.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/Session.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** Session.java	27 May 2002 17:21:38 -0000	1.26
--- Session.java	28 May 2002 04:50:06 -0000	1.27
***************
*** 615,619 ****
          try {
              this.changeState(SESSION_STATE_ABORTED);
!             shutdown();
          } catch (BEEPException e) {
  
--- 615,624 ----
          try {
              this.changeState(SESSION_STATE_ABORTED);
!             this.disableIO();
!             channels.clear();
! 
!             zero = null;
! 
!             fireSessionTerminated();
          } catch (BEEPException e) {
  
***************
*** 1255,1269 ****
  
          return false;
-     }
- 
-     private void shutdown() throws BEEPException
-     {
-         this.disableIO();
-         channels.clear();
- 
-         zero = null;
- 
-         this.changeState(SESSION_STATE_CLOSED);
-         fireSessionTerminated();
      }
  
--- 1260,1263 ----