You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2018/06/06 13:02:40 UTC
[2/3] mina git commit: Fixed typoes and formating
Fixed typoes and formating
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/3bf068df
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/3bf068df
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/3bf068df
Branch: refs/heads/2.0
Commit: 3bf068dfb458bc786414fa3410928e745f0f12d4
Parents: f310906
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Wed Jun 6 15:02:04 2018 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Wed Jun 6 15:02:04 2018 +0200
----------------------------------------------------------------------
.../core/polling/AbstractPollingIoAcceptor.java | 2 +-
.../mina/transport/socket/nio/NioProcessor.java | 2 +-
.../transport/socket/nio/NioSocketAcceptor.java | 28 ++++++++++----------
3 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/3bf068df/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java b/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
index bf1bbf0..8ca46a9 100644
--- a/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
+++ b/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
@@ -465,7 +465,7 @@ public abstract class AbstractPollingIoAcceptor<S extends AbstractIoSession, H>
// woke up
int selected = select();
- // Now, if the number of registred handles is 0, we can
+ // Now, if the number of registered handles is 0, we can
// quit the loop: we don't have any socket listening
// for incoming connection.
if (nHandles == 0) {
http://git-wip-us.apache.org/repos/asf/mina/blob/3bf068df/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioProcessor.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioProcessor.java b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioProcessor.java
index e9755aa..7100161 100644
--- a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioProcessor.java
+++ b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioProcessor.java
@@ -283,7 +283,7 @@ public final class NioProcessor extends AbstractPollingIoProcessor<NioSession> {
SelectionKey key = session.getSelectionKey();
if (key == null) {
- // The channel is not yet registred to a selector
+ // The channel is not yet regisetred to a selector
return SessionState.OPENING;
}
http://git-wip-us.apache.org/repos/asf/mina/blob/3bf068df/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java
index 939f58a..f011ca1 100644
--- a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java
+++ b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java
@@ -199,20 +199,20 @@ implements SocketAcceptor {
return new NioSocketSession(this, processor, ch);
} catch (Throwable t) {
- if(t.getMessage().equals("Too many open files")) {
- LOGGER.error("Error Calling Accept on Socket - Sleeping Acceptor Thread. Check the ulimit parameter", t);
- try {
- // Sleep 50 ms, so that the select does not spin like crazy doing nothing but eating CPU
- // This is typically what will happen if we don't have any more File handle on the server
- // Check the ulimit parameter
- // NOTE : this is a workaround, there is no way we can handle this exception in any smarter way...
- Thread.sleep(50L);
- } catch (InterruptedException ie) {
- // Nothing to do
- }
- } else {
- throw t;
- }
+ if(t.getMessage().equals("Too many open files")) {
+ LOGGER.error("Error Calling Accept on Socket - Sleeping Acceptor Thread. Check the ulimit parameter", t);
+ try {
+ // Sleep 50 ms, so that the select does not spin like crazy doing nothing but eating CPU
+ // This is typically what will happen if we don't have any more File handle on the server
+ // Check the ulimit parameter
+ // NOTE : this is a workaround, there is no way we can handle this exception in any smarter way...
+ Thread.sleep(50L);
+ } catch (InterruptedException ie) {
+ // Nothing to do
+ }
+ } else {
+ throw t;
+ }
// No session when we have met an exception
return null;