diff --git a/NOTICE b/NOTICE index c218b26089b80d9c7e7856c627f00a7bb5f5d025..703c28b27c5cc6c509526a587a56d806b8afa79e 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache RocketMQ -Copyright 2016-2017 The Apache Software Foundation +Copyright 2016-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file diff --git a/docs/cn/index.md b/docs/cn/index.md new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/docs/en/index.md b/docs/en/index.md new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/pom.xml b/pom.xml index 1e3c4bcc85970a374d3dc33ab399f8dbcb58933a..ff96c4cb7db6097d0cf2faeb16965e5e5da8cf08 100644 --- a/pom.xml +++ b/pom.xml @@ -262,6 +262,7 @@ src/main/resources/META-INF/service/* */target/** */*.iml + docs/** diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java index 28ae001b7f33672da6147b5afd57801877b5ffb0..d190e00f44f6d6e4b736bedce0e391db70db6a84 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java @@ -446,7 +446,8 @@ public abstract class NettyRemotingAbstract { final SemaphoreReleaseOnlyOnce once = new SemaphoreReleaseOnlyOnce(this.semaphoreAsync); long costTime = System.currentTimeMillis() - beginStartTime; if (timeoutMillis < costTime) { - throw new RemotingTooMuchRequestException("invokeAsyncImpl call timeout"); + once.release(); + throw new RemotingTimeoutException("invokeAsyncImpl call timeout"); } final ResponseFuture responseFuture = new ResponseFuture(channel, opaque, timeoutMillis - costTime, invokeCallback, once);