You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by jv...@apache.org on 2012/11/22 23:47:15 UTC
svn commit: r1412698 - in
/mina/mina/trunk/core/src/main/java/org/apache/mina:
api/RuntimeIoException.java session/AbstractIoSession.java
transport/nio/NioSelectorLoop.java transport/nio/NioUdpSession.java
Author: jvermillard
Date: Thu Nov 22 22:47:03 2012
New Revision: 1412698
URL: http://svn.apache.org/viewvc?rev=1412698&view=rev
Log:
exception cleanup
Removed:
mina/mina/trunk/core/src/main/java/org/apache/mina/api/RuntimeIoException.java
Modified:
mina/mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioSelectorLoop.java
mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioUdpSession.java
Modified: mina/mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
URL: http://svn.apache.org/viewvc/mina/mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java?rev=1412698&r1=1412697&r2=1412698&view=diff
==============================================================================
--- mina/mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java (original)
+++ mina/mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java Thu Nov 22 22:47:03 2012
@@ -38,7 +38,6 @@ import org.apache.mina.api.IoFuture;
import org.apache.mina.api.IoHandler;
import org.apache.mina.api.IoService;
import org.apache.mina.api.IoSession;
-import org.apache.mina.api.RuntimeIoException;
import org.apache.mina.filterchain.ReadFilterChainController;
import org.apache.mina.filterchain.WriteFilterChainController;
import org.apache.mina.service.idlechecker.IdleChecker;
@@ -594,7 +593,7 @@ public abstract class AbstractIoSession
switch (state) {
case CREATED:
LOG.error("Session {} not opened", this);
- throw new RuntimeIoException("cannot close an not opened session");
+ throw new IllegalStateException("cannot close an not opened session");
case CONNECTED:
state = SessionState.CLOSING;
if (immediately) {
@@ -613,7 +612,7 @@ public abstract class AbstractIoSession
LOG.warn("Already closed session {}", this);
break;
default:
- throw new RuntimeIoException("not implemented session state : " + state);
+ throw new IllegalStateException("not implemented session state : " + state);
}
return closeFuture;
Modified: mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioSelectorLoop.java
URL: http://svn.apache.org/viewvc/mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioSelectorLoop.java?rev=1412698&r1=1412697&r2=1412698&view=diff
==============================================================================
--- mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioSelectorLoop.java (original)
+++ mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioSelectorLoop.java Thu Nov 22 22:47:03 2012
@@ -30,7 +30,6 @@ import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import org.apache.mina.api.IoSession;
-import org.apache.mina.api.RuntimeIoException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -90,7 +89,8 @@ public class NioSelectorLoop implements
selector = Selector.open();
} catch (final IOException ioe) {
logger.error("Impossible to open a new NIO selector, O/S is out of file descriptor ?");
- throw new RuntimeIoException(ioe);
+ throw new IllegalStateException("Impossible to open a new NIO selector, O/S is out of file descriptor ?",
+ ioe);
}
logger.debug("starting worker thread");
worker.start();
@@ -113,7 +113,7 @@ public class NioSelectorLoop implements
public void register(IoSession session, boolean accept, boolean read, boolean write, SelectorListener listener,
SelectableChannel channel) {
logger.debug("registering : {} for accept : {}, read : {}, write : {}", new Object[] { listener, accept, read,
- write });
+ write });
int ops = 0;
if (accept) {
@@ -142,7 +142,7 @@ public class NioSelectorLoop implements
public void modifyRegistration(final boolean accept, final boolean read, final boolean write,
final SelectorListener listener, final SelectableChannel channel) {
logger.debug("modifying registration : {} for accept : {}, read : {}, write : {}", new Object[] { listener,
- accept, read, write });
+ accept, read, write });
final SelectionKey key = channel.keyFor(selector);
if (key == null) {
Modified: mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioUdpSession.java
URL: http://svn.apache.org/viewvc/mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioUdpSession.java?rev=1412698&r1=1412697&r2=1412698&view=diff
==============================================================================
--- mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioUdpSession.java (original)
+++ mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioUdpSession.java Thu Nov 22 22:47:03 2012
@@ -25,7 +25,6 @@ import java.nio.ByteBuffer;
import org.apache.mina.api.IoFuture;
import org.apache.mina.api.IoService;
import org.apache.mina.api.IoSessionConfig;
-import org.apache.mina.api.RuntimeIoException;
import org.apache.mina.service.idlechecker.IdleChecker;
import org.apache.mina.session.AbstractIoSession;
import org.apache.mina.util.AbstractIoFuture;
@@ -34,6 +33,7 @@ import org.slf4j.LoggerFactory;
/**
* A UDP session based on NIO
+ *
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
public class NioUdpSession extends AbstractIoSession {
@@ -109,7 +109,7 @@ public class NioUdpSession extends Abstr
switch (state) {
case CREATED:
LOG.error("Session {} not opened", this);
- throw new RuntimeIoException("cannot close an not opened session");
+ throw new IllegalStateException("cannot close an not opened session");
case CONNECTED:
case CLOSING:
if (immediately) {
@@ -192,6 +192,7 @@ public class NioUdpSession extends Abstr
/**
* Called when the session received a datagram.
+ *
* @param readBuffer the received datagram
*/
void receivedDatagram(ByteBuffer readBuffer) {