Merge branch 'master' of https://github.com/AlibabaTech/dubbo
This commit is contained in:
commit
0daedb70fe
|
|
@ -7,4 +7,4 @@ target
|
|||
*.iml
|
||||
*.iws
|
||||
.idea/
|
||||
dubbo.log
|
||||
*.log
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
<!--
|
||||
- Copyright 1999-2011 Alibaba Group.
|
||||
-
|
||||
- Licensed 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.
|
||||
-->
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-parent</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-admin</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>${project.artifactId}</name>
|
||||
<description>The admin module of dubbo project</description>
|
||||
<properties>
|
||||
<skip_maven_deploy>true</skip_maven_deploy>
|
||||
</properties>
|
||||
</project>
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-parent</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-cluster</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-parent</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-common</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-config</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-config-api</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -61,6 +61,8 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
|
|||
|
||||
private static final ProxyFactory proxyFactory = ExtensionLoader.getExtensionLoader(ProxyFactory.class).getAdaptiveExtension();
|
||||
|
||||
private static final Map<String, Integer> RANDOM_PORT_MAP = new HashMap<String, Integer>();
|
||||
|
||||
// 接口类型
|
||||
private String interfaceName;
|
||||
|
||||
|
|
@ -315,7 +317,11 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
|
|||
port = ExtensionLoader.getExtensionLoader(Protocol.class).getExtension(name).getDefaultPort();
|
||||
}
|
||||
if (port == null || port <= 0) {
|
||||
port = NetUtils.getAvailablePort();
|
||||
port = getRandomPort(name);
|
||||
if (port == null || port < 0) {
|
||||
port = NetUtils.getAvailablePort();
|
||||
putRandomPort(name, port);
|
||||
}
|
||||
logger.warn("Use random available port(" + port + ") for protocol " + name);
|
||||
}
|
||||
Map<String, String> map = new HashMap<String, String>();
|
||||
|
|
@ -491,6 +497,9 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
|
|||
setProtocol(new ProtocolConfig());
|
||||
}
|
||||
for (ProtocolConfig protocolConfig : protocols) {
|
||||
if (StringUtils.isEmpty(protocolConfig.getName())) {
|
||||
protocolConfig.setName("dubbo");
|
||||
}
|
||||
appendProperties(protocolConfig);
|
||||
}
|
||||
}
|
||||
|
|
@ -654,4 +663,18 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
|
|||
return provider;
|
||||
}
|
||||
|
||||
private static Integer getRandomPort(String protocol) {
|
||||
protocol = protocol.toLowerCase();
|
||||
if (RANDOM_PORT_MAP.containsKey(protocol)) {
|
||||
return RANDOM_PORT_MAP.get(protocol);
|
||||
}
|
||||
return Integer.MIN_VALUE;
|
||||
}
|
||||
|
||||
private static void putRandomPort(String protocol, Integer port) {
|
||||
protocol = protocol.toLowerCase();
|
||||
if (!RANDOM_PORT_MAP.containsKey(protocol)) {
|
||||
RANDOM_PORT_MAP.put(protocol, port);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-config</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-config-spring</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
|
|||
import com.alibaba.dubbo.common.URL;
|
||||
import com.alibaba.dubbo.common.extension.ExtensionLoader;
|
||||
import com.alibaba.dubbo.common.utils.NetUtils;
|
||||
import com.alibaba.dubbo.common.utils.StringUtils;
|
||||
import com.alibaba.dubbo.config.ApplicationConfig;
|
||||
import com.alibaba.dubbo.config.ConsumerConfig;
|
||||
import com.alibaba.dubbo.config.ProtocolConfig;
|
||||
|
|
@ -43,14 +44,18 @@ import com.alibaba.dubbo.config.spring.action.DemoActionByAnnotation;
|
|||
import com.alibaba.dubbo.config.spring.action.DemoActionBySetter;
|
||||
import com.alibaba.dubbo.config.spring.annotation.consumer.AnnotationAction;
|
||||
import com.alibaba.dubbo.config.spring.api.DemoService;
|
||||
import com.alibaba.dubbo.config.spring.api.HelloService;
|
||||
import com.alibaba.dubbo.config.spring.filter.MockFilter;
|
||||
import com.alibaba.dubbo.config.spring.impl.DemoServiceImpl;
|
||||
import com.alibaba.dubbo.config.spring.impl.HelloServiceImpl;
|
||||
import com.alibaba.dubbo.registry.RegistryService;
|
||||
import com.alibaba.dubbo.rpc.Exporter;
|
||||
import com.alibaba.dubbo.rpc.Filter;
|
||||
import com.alibaba.dubbo.rpc.RpcContext;
|
||||
import com.alibaba.dubbo.rpc.RpcException;
|
||||
|
||||
import junit.framework.Assert;
|
||||
|
||||
|
||||
/**
|
||||
* ConfigTest
|
||||
|
|
@ -804,4 +809,84 @@ public class ConfigTest {
|
|||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testDubboProtocolPortOverride() throws Exception {
|
||||
String dubboPort = System.getProperty("dubbo.protocol.dubbo.port");
|
||||
int port = 55555;
|
||||
System.setProperty("dubbo.protocol.dubbo.port", String.valueOf(port));
|
||||
ServiceConfig<DemoService> service = null;
|
||||
try {
|
||||
ApplicationConfig application = new ApplicationConfig();
|
||||
application.setName("dubbo-protocol-port-override");
|
||||
|
||||
RegistryConfig registry = new RegistryConfig();
|
||||
registry.setAddress("N/A");
|
||||
|
||||
ProtocolConfig protocol = new ProtocolConfig();
|
||||
|
||||
service = new ServiceConfig<DemoService>();
|
||||
service.setInterface(DemoService.class);
|
||||
service.setRef(new DemoServiceImpl());
|
||||
service.setApplication(application);
|
||||
service.setRegistry(registry);
|
||||
service.setProtocol(protocol);
|
||||
service.export();
|
||||
|
||||
Assert.assertEquals(port, service.getExportedUrls().get(0).getPort());
|
||||
} finally {
|
||||
if (StringUtils.isNotEmpty(dubboPort)) {
|
||||
System.setProperty("dubbo.protocol.dubbo.port", dubboPort);
|
||||
}
|
||||
if (service != null) {
|
||||
service.unexport();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProtocolRandomPort() throws Exception {
|
||||
ServiceConfig<DemoService> demoService = null;
|
||||
ServiceConfig<HelloService> helloService = null;
|
||||
|
||||
ApplicationConfig application = new ApplicationConfig();
|
||||
application.setName("test-protocol-random-port");
|
||||
|
||||
RegistryConfig registry = new RegistryConfig();
|
||||
registry.setAddress("N/A");
|
||||
|
||||
ProtocolConfig protocol = new ProtocolConfig();
|
||||
protocol.setName("dubbo");
|
||||
protocol.setPort(-1);
|
||||
|
||||
demoService = new ServiceConfig<DemoService>();
|
||||
demoService.setInterface(DemoService.class);
|
||||
demoService.setRef(new DemoServiceImpl());
|
||||
demoService.setApplication(application);
|
||||
demoService.setRegistry(registry);
|
||||
demoService.setProtocol(protocol);
|
||||
|
||||
helloService = new ServiceConfig<HelloService>();
|
||||
helloService.setInterface(HelloService.class);
|
||||
helloService.setRef(new HelloServiceImpl());
|
||||
helloService.setApplication(application);
|
||||
helloService.setRegistry(registry);
|
||||
helloService.setProtocol(protocol);
|
||||
|
||||
try {
|
||||
demoService.export();
|
||||
helloService.export();
|
||||
|
||||
Assert.assertEquals(demoService.getExportedUrls().get(0).getPort(),
|
||||
helloService.getExportedUrls().get(0).getPort());
|
||||
} finally {
|
||||
unexportService(demoService);
|
||||
unexportService(helloService);
|
||||
}
|
||||
}
|
||||
|
||||
private static void unexportService(ServiceConfig<?> config) {
|
||||
if (config != null) {
|
||||
config.unexport();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
/*
|
||||
* Copyright 1999-2011 Alibaba Group.
|
||||
*
|
||||
* Licensed 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 com.alibaba.dubbo.config.spring.api;
|
||||
|
||||
/**
|
||||
* @author <a href="mailto:gang.lvg@alibaba-inc.com">kimi</a>
|
||||
*/
|
||||
public interface HelloService {
|
||||
String sayHello(String name);
|
||||
}
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
/*
|
||||
* Copyright 1999-2011 Alibaba Group.
|
||||
*
|
||||
* Licensed 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 com.alibaba.dubbo.config.spring.impl;
|
||||
|
||||
import com.alibaba.dubbo.config.spring.api.HelloService;
|
||||
|
||||
/**
|
||||
* @author <a href="mailto:gang.lvg@alibaba-inc.com">kimi</a>
|
||||
*/
|
||||
public class HelloServiceImpl implements HelloService {
|
||||
|
||||
public String sayHello(String name) {
|
||||
return "Hello, " + name;
|
||||
}
|
||||
}
|
||||
|
|
@ -19,10 +19,10 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-parent</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-config</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>${project.artifactId}</name>
|
||||
<description>The config module of dubbo project</description>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-container</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-container-api</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-container</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-container-jetty</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-container</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-container-log4j</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-container</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-container-spring</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-parent</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-container</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>${project.artifactId}</name>
|
||||
<description>The container module of dubbo project</description>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-demo</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-demo-api</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-demo</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-demo-consumer</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-demo</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-demo-examples</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-demo</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-demo-provider</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-parent</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-demo</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>${project.artifactId}</name>
|
||||
<description>The demo module of dubbo project</description>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-filter</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-filter-cache</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-filter</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-filter-validation</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-parent</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-filter</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>${project.artifactId}</name>
|
||||
<description>The filter module of dubbo project</description>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-monitor</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-monitor-api</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-monitor</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-monitor-default</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-parent</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-monitor</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>${project.artifactId}</name>
|
||||
<description>The monitor module of dubbo project</description>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-registry</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-registry-api</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-registry</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-registry-default</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-registry</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-registry-multicast</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-registry</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-registry-redis</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-registry</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-registry-zookeeper</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-parent</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-registry</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>${project.artifactId}</name>
|
||||
<description>The registry module of dubbo project</description>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-remoting</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-remoting-api</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -207,13 +207,15 @@ public class ExchangeCodec extends TelnetCodec {
|
|||
return req;
|
||||
}
|
||||
} finally {
|
||||
try {
|
||||
if (logger.isWarnEnabled()) {
|
||||
logger.warn("Skip input stream " + is.available());
|
||||
}
|
||||
StreamUtils.skipUnusedStream(is);
|
||||
} catch (IOException e) {
|
||||
logger.warn(e.getMessage(), e);
|
||||
if (is.available() > 0) {
|
||||
try {
|
||||
if (logger.isWarnEnabled()) {
|
||||
logger.warn("Skip input stream " + is.available());
|
||||
}
|
||||
StreamUtils.skipUnusedStream(is);
|
||||
} catch (IOException e) {
|
||||
logger.warn(e.getMessage(), e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-remoting</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-remoting-grizzly</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-remoting</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-remoting-http</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-remoting</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-remoting-mina</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-remoting</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-remoting-netty</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-remoting</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-remoting-p2p</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-remoting</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-remoting-zookeeper</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-parent</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-remoting</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>${project.artifactId}</name>
|
||||
<description>The remoting module of dubbo project</description>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-rpc</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-rpc-api</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-rpc</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-rpc-default</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-rpc</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-rpc-hessian</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-rpc</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-rpc-http</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-rpc</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-rpc-injvm</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-rpc</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-rpc-memcached</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-rpc</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-rpc-redis</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-rpc</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-rpc-rmi</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-rpc</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-rpc-thrift</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-rpc</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-rpc-webservice</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-parent</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-rpc</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>${project.artifactId}</name>
|
||||
<description>The rpc module of dubbo project</description>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-simple</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-monitor-simple</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-simple</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-registry-simple</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-parent</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-simple</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>${project.artifactId}</name>
|
||||
<description>The simple implementation module of dubbo project</description>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-test</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-test-benchmark</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-test</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-test-compatibility</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-test</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-test-integration</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-parent</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo-test</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>${project.artifactId}</name>
|
||||
<description>The test module of dubbo project</description>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<parent>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>dubbo-parent</artifactId>
|
||||
<version>2.4.0-SNAPSHOT</version>
|
||||
<version>2.3.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>dubbo</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
Loading…
Reference in New Issue