Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/transport/tcp
In directory usw-pr-cvs1:/tmp/cvs-serv13341/src/org/beepcore/beep/transport/tcp
Modified Files:
TCPSession.java
Log Message:
Decoupling transport from session state
Index: TCPSession.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/transport/tcp/TCPSession.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** TCPSession.java 2 May 2002 02:07:58 -0000 1.23
--- TCPSession.java 7 May 2002 04:59:23 -0000 1.24
***************
*** 423,433 ****
while (running) {
- if (getState() == SESSION_STATE_CLOSING ||
- getState() == SESSION_STATE_TERMINATING ||
- getState() == SESSION_STATE_CLOSED)
- {
- break;
- }
-
if (Log.isLogged(Log.SEV_DEBUG_VERBOSE)) {
Log.logEntry(Log.SEV_DEBUG_VERBOSE, TCP_MAPPING,
--- 423,426 ----
***************
*** 448,452 ****
} catch (java.net.SocketException e) {
! if (getState() == SESSION_STATE_ACTIVE) {
throw e;
}
--- 441,445 ----
} catch (java.net.SocketException e) {
! if (running) {
throw e;
}
***************
*** 507,511 ****
} catch (java.net.SocketException e) {
! if (getState() == SESSION_STATE_ACTIVE) {
throw e;
}
--- 500,504 ----
} catch (java.net.SocketException e) {
! if (running) {
throw e;
}
***************
*** 513,517 ****
// socket closed intentionally (session closing)
// so just return
- running = false;
return;
}
--- 506,509 ----
***************
*** 669,673 ****
} catch (java.net.SocketException e) {
! if (getState() == SESSION_STATE_ACTIVE) {
throw e;
}
--- 661,665 ----
} catch (java.net.SocketException e) {
! if (running) {
throw e;
}
***************
*** 675,679 ****
// socket closed intentionally (session closing)
// so just return
- running = false;
return;
}
--- 667,670 ----
|
