Author: elecharny
Date: Tue Dec 6 22:09:27 2011
New Revision: 1211203
URL: http://svn.apache.org/viewvc?rev=1211203&view=rev
Log:
o No need to pass two states in the IoSession.changeState() method : we just
need the new state (fixed)
o Fixed a compilation error in NioSelectorProcessor
Modified:
mina/trunk/core/src/main/java/org/apache/mina/api/IoSession.java
mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java
Modified: mina/trunk/core/src/main/java/org/apache/mina/api/IoSession.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/api/IoSession.java?rev=1211203&r1=1211202&r2=1211203&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/api/IoSession.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/api/IoSession.java Tue Dec 6
22:09:27 2011
@@ -131,7 +131,7 @@ public interface IoSession {
boolean isSecured();
/**
- * Changes the session's state from a given state to another state. Not
all the
+ * Changes the session's state from the current state to a new state. Not
all the
* transition are allowed. Here is the list of all the possible
transitions :<br/>
* <ul>
* <li>CREATED -> CONNECTED</li>
@@ -146,10 +146,9 @@ public interface IoSession {
* <li>CLOSING -> CLOSED</li>
* </ul>
*
- * @param from The initial SessionState
- * @param to The final SessionState
+ * @param newState The final SessionState
*/
- void changeState(SessionState from, SessionState to) throws
IllegalStateException;
+ void changeState(SessionState newState) throws IllegalStateException;
/**
* Initializes the SSL/TLS environment for this session.
Modified:
mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java?rev=1211203&r1=1211202&r2=1211203&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
Tue Dec 6 22:09:27 2011
@@ -225,11 +225,11 @@ public abstract class AbstractIoSession
/**
* {@inheritDoc}
*/
- public void changeState(SessionState from, SessionState to) throws
IllegalStateException {
+ public void changeState(SessionState to) throws IllegalStateException {
try {
stateWriteLock.lock();
- switch (from) {
+ switch (state) {
case CREATED :
switch (to) {
case CONNECTED :
@@ -239,7 +239,7 @@ public abstract class AbstractIoSession
break;
default :
- throw new IllegalStateException("Cannot transit
from " + from + " to " + to );
+ throw new IllegalStateException("Cannot transit
from " + state + " to " + to );
}
break;
@@ -252,7 +252,7 @@ public abstract class AbstractIoSession
break;
default :
- throw new IllegalStateException("Cannot transit
from " + from + " to " + to );
+ throw new IllegalStateException("Cannot transit
from " + state + " to " + to );
}
break;
@@ -265,7 +265,7 @@ public abstract class AbstractIoSession
break;
default :
- throw new IllegalStateException("Cannot transit
from " + from + " to " + to );
+ throw new IllegalStateException("Cannot transit
from " + state + " to " + to );
}
break;
@@ -279,13 +279,13 @@ public abstract class AbstractIoSession
break;
default :
- throw new IllegalStateException("Cannot transit
from " + from + " to " + to );
+ throw new IllegalStateException("Cannot transit
from " + state + " to " + to );
}
break;
case CLOSING :
if (to != SessionState.CLOSED) {
- throw new IllegalStateException("Cannot transit from "
+ from + " to " + to );
+ throw new IllegalStateException("Cannot transit from "
+ state + " to " + to );
}
state = to;
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java?rev=1211203&r1=1211202&r2=1211203&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
Tue Dec 6 22:09:27 2011
@@ -43,6 +43,7 @@ import javax.net.ssl.SSLEngineResult.Han
import org.apache.mina.api.IoServer;
import org.apache.mina.api.IoService;
import org.apache.mina.api.IoSession;
+import org.apache.mina.api.IoSession.SessionState;
import org.apache.mina.api.RuntimeIoException;
import org.apache.mina.service.AbstractIoService;
import org.apache.mina.service.SelectorProcessor;
@@ -489,7 +490,7 @@ public class NioSelectorProcessor implem
LOGGER.debug("{} processing the FINISHED state",
session);
}
- session.getState().
+ session.changeState(SessionState.SECURED);
break;
}
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java?rev=1211203&r1=1211202&r2=1211203&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java
Tue Dec 6 22:09:27 2011
@@ -219,10 +219,10 @@ public class NioTcpSession extends Abstr
* Set this session status as connected. To be called by the processor
selecting/polling this session.
*/
void setConnected() {
-
if (!isCreated()) {
throw new RuntimeException("Trying to open a non created session");
}
+
state = SessionState.CONNECTED;
}
}
