This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new ab27a39 fix spell (#3750)
ab27a39 is described below
commit ab27a398bcf17f5a5928ece4db9d5e75c378e38c
Author: niujialin <[email protected]>
AuthorDate: Wed Mar 27 16:25:34 2019 +0800
fix spell (#3750)
* fix spell
* revert
---
.../transport/dispatcher/all/AllChannelHandler.java | 16 ++++++++--------
.../connection/ConnectionOrderedChannelHandler.java | 8 ++++----
.../dispatcher/execution/ExecutionChannelHandler.java | 4 ++--
.../dispatcher/message/MessageOnlyChannelHandler.java | 4 ++--
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/all/AllChannelHandler.java
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/all/AllChannelHandler.java
index 88431fd..3ea9d40 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/all/AllChannelHandler.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/all/AllChannelHandler.java
@@ -38,9 +38,9 @@ public class AllChannelHandler extends WrappedChannelHandler {
@Override
public void connected(Channel channel) throws RemotingException {
- ExecutorService cexecutor = getExecutorService();
+ ExecutorService executor = getExecutorService();
try {
- cexecutor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.CONNECTED));
+ executor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.CONNECTED));
} catch (Throwable t) {
throw new ExecutionException("connect event", channel, getClass()
+ " error when process connected event .", t);
}
@@ -48,9 +48,9 @@ public class AllChannelHandler extends WrappedChannelHandler {
@Override
public void disconnected(Channel channel) throws RemotingException {
- ExecutorService cexecutor = getExecutorService();
+ ExecutorService executor = getExecutorService();
try {
- cexecutor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.DISCONNECTED));
+ executor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.DISCONNECTED));
} catch (Throwable t) {
throw new ExecutionException("disconnect event", channel,
getClass() + " error when process disconnected event .", t);
}
@@ -58,9 +58,9 @@ public class AllChannelHandler extends WrappedChannelHandler {
@Override
public void received(Channel channel, Object message) throws
RemotingException {
- ExecutorService cexecutor = getExecutorService();
+ ExecutorService executor = getExecutorService();
try {
- cexecutor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.RECEIVED, message));
+ executor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.RECEIVED, message));
} catch (Throwable t) {
//TODO A temporary solution to the problem that the exception
information can not be sent to the opposite end after the thread pool is full.
Need a refactoring
//fix The thread pool is full, refuses to call, does not return,
and causes the consumer to wait for time out
@@ -81,9 +81,9 @@ public class AllChannelHandler extends WrappedChannelHandler {
@Override
public void caught(Channel channel, Throwable exception) throws
RemotingException {
- ExecutorService cexecutor = getExecutorService();
+ ExecutorService executor = getExecutorService();
try {
- cexecutor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.CAUGHT, exception));
+ executor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.CAUGHT, exception));
} catch (Throwable t) {
throw new ExecutionException("caught event", channel, getClass() +
" error when process caught event .", t);
}
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedChannelHandler.java
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedChannelHandler.java
index a40d432..d6aff15 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedChannelHandler.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedChannelHandler.java
@@ -75,9 +75,9 @@ public class ConnectionOrderedChannelHandler extends
WrappedChannelHandler {
@Override
public void received(Channel channel, Object message) throws
RemotingException {
- ExecutorService cexecutor = getExecutorService();
+ ExecutorService executor = getExecutorService();
try {
- cexecutor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.RECEIVED, message));
+ executor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.RECEIVED, message));
} catch (Throwable t) {
//fix, reject exception can not be sent to consumer because thread
pool is full, resulting in consumers waiting till timeout.
if (message instanceof Request && t instanceof
RejectedExecutionException) {
@@ -97,9 +97,9 @@ public class ConnectionOrderedChannelHandler extends
WrappedChannelHandler {
@Override
public void caught(Channel channel, Throwable exception) throws
RemotingException {
- ExecutorService cexecutor = getExecutorService();
+ ExecutorService executor = getExecutorService();
try {
- cexecutor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.CAUGHT, exception));
+ executor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.CAUGHT, exception));
} catch (Throwable t) {
throw new ExecutionException("caught event", channel, getClass() +
" error when process caught event .", t);
}
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/execution/ExecutionChannelHandler.java
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/execution/ExecutionChannelHandler.java
index ac588f3..e39d138 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/execution/ExecutionChannelHandler.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/execution/ExecutionChannelHandler.java
@@ -42,10 +42,10 @@ public class ExecutionChannelHandler extends
WrappedChannelHandler {
@Override
public void received(Channel channel, Object message) throws
RemotingException {
- ExecutorService cexecutor = getExecutorService();
+ ExecutorService executor = getExecutorService();
if (message instanceof Request) {
try {
- cexecutor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.RECEIVED, message));
+ executor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.RECEIVED, message));
} catch (Throwable t) {
// FIXME: when the thread pool is full,
SERVER_THREADPOOL_EXHAUSTED_ERROR cannot return properly,
// therefore the consumer side has to wait until gets timeout.
This is a temporary solution to prevent
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/message/MessageOnlyChannelHandler.java
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/message/MessageOnlyChannelHandler.java
index 3e756c7..2f51860 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/message/MessageOnlyChannelHandler.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/message/MessageOnlyChannelHandler.java
@@ -35,9 +35,9 @@ public class MessageOnlyChannelHandler extends
WrappedChannelHandler {
@Override
public void received(Channel channel, Object message) throws
RemotingException {
- ExecutorService cexecutor = getExecutorService();
+ ExecutorService executor = getExecutorService();
try {
- cexecutor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.RECEIVED, message));
+ executor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.RECEIVED, message));
} catch (Throwable t) {
throw new ExecutionException(message, channel, getClass() + "
error when process received event .", t);
}
