DUBBO-501 随机端口改为在缺省端口的基础上增长

wengang285 · Jul 18, 2012 · bf0eee9 · bf0eee9
1 parent 17243e7
commit bf0eee9
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/NetUtils.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/NetUtils.java
@@ -70,6 +70,29 @@ public static int getAvailablePort() {
                 }
             }
         }
+    }
+
+    public static int getAvailablePort(int port) {
+    	if (port <= 0) {
+    		return getAvailablePort();
+    	}
+    	for(int i = port; i < MAX_PORT; i ++) {
+    		ServerSocket ss = null;
+            try {
+                ss = new ServerSocket(i);
+                return ss.getLocalPort();
+            } catch (IOException e) {
+            	// continue
+            } finally {
+                if (ss != null) {
+                    try {
+                        ss.close();
+                    } catch (IOException e) {
+                    }
+                }
+            }
+    	}
+    	return port;
     }
 
     private static final int MIN_PORT = 0;

diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
@@ -313,13 +313,14 @@ private void doExportUrls() {
             if (provider != null && (port == null || port == 0)) {
                 port = provider.getPort();
             }
+            int defaultPort = ExtensionLoader.getExtensionLoader(Protocol.class).getExtension(name).getDefaultPort();
             if (port == null || port == 0) {
-                port = ExtensionLoader.getExtensionLoader(Protocol.class).getExtension(name).getDefaultPort();
+                port = defaultPort;
             }
             if (port == null || port <= 0) {
                 port = getRandomPort(name);
                 if (port == null || port < 0) {
-                    port = NetUtils.getAvailablePort();
+                    port = NetUtils.getAvailablePort(defaultPort);
                     putRandomPort(name, port);
                 }
                 logger.warn("Use random available port(" + port + ") for protocol " + name);