This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.x-dev
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/3.x-dev by this push:
new 4b79622 add license and revert demo changes
4b79622 is described below
commit 4b796220a5d43b4793b8e7a9d2d4d43f0be77d64
Author: ken.lj <[email protected]>
AuthorDate: Tue May 21 14:34:03 2019 +0800
add license and revert demo changes
---
.../org/apache/dubbo/common/threadpool/manager/Ring.java | 16 ++++++++++++++++
.../src/main/resources/spring/dubbo-consumer.xml | 2 +-
.../org/apache/dubbo/demo/provider/DemoServiceImpl.java | 5 -----
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/Ring.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/Ring.java
index 1ddc0fd..eb9e50a 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/Ring.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/Ring.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.dubbo.common.threadpool.manager;
import java.util.Collections;
diff --git
a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/src/main/resources/spring/dubbo-consumer.xml
b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/src/main/resources/spring/dubbo-consumer.xml
index 286b24b..6b5efc3 100644
---
a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/src/main/resources/spring/dubbo-consumer.xml
+++
b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/src/main/resources/spring/dubbo-consumer.xml
@@ -27,6 +27,6 @@
<!-- generate proxy for the remote service, then demoService can be used
in the same way as the
local regular interface -->
- <dubbo:reference timeout="600000" id="demoService" check="false"
interface="org.apache.dubbo.demo.DemoService"/>
+ <dubbo:reference id="demoService" check="false"
interface="org.apache.dubbo.demo.DemoService"/>
</beans>
diff --git
a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java
b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java
index 4856411..e95caa6 100644
---
a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java
+++
b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java
@@ -30,11 +30,6 @@ public class DemoServiceImpl implements DemoService {
@Override
public String sayHello(String name) {
logger.info("Hello " + name + ", request from consumer: " +
RpcContext.getContext().getRemoteAddress());
- try {
- Thread.sleep(10000);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
return "Hello " + name + ", response from provider: " +
RpcContext.getContext().getLocalAddress();
}
