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

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

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

Modified Files:
	Session.java 
Log Message:
fixed state change for closing the session

Index: Session.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/Session.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** Session.java	11 May 2002 01:44:57 -0000	1.25
--- Session.java	27 May 2002 17:21:38 -0000	1.26
***************
*** 1091,1111 ****
          // @todo fireEvent(SESSION_STATE_CLOSING);
  
-         /*
-         try {
-             if (!changeState(SESSION_STATE_CLOSING)) {
- 
-                 // @todo got consecutive shutdowns... now what... log it?
-                 // Utility.assert("Illegal state for shutdown", -1);
-             }
-         } catch (BEEPException e) {
-             throw new BEEPError(BEEPError.CODE_REQUESTED_ACTION_ABORTED,
-                                 e.getMessage());
-         }
-         */
          Log.logEntry(Log.SEV_DEBUG,
                       "Closing Session with " + channels.size() + " channels");
  
-         /*
          try {
              changeState(SESSION_STATE_CLOSING);
          } catch (BEEPException x) {
--- 1091,1099 ----
          // @todo fireEvent(SESSION_STATE_CLOSING);
  
          Log.logEntry(Log.SEV_DEBUG,
                       "Closing Session with " + channels.size() + " channels");
  
          try {
+             changeState(SESSION_STATE_CLOSE_PENDING);
              changeState(SESSION_STATE_CLOSING);
          } catch (BEEPException x) {
***************
*** 1113,1117 ****
              return;
          }
!         */
          Iterator i = channels.values().iterator();
  
--- 1101,1105 ----
              return;
          }
! 
          Iterator i = channels.values().iterator();