From c3abba025200644b6bfafc35224e77457a6290dd Mon Sep 17 00:00:00 2001
From: v_dylanxu <136539068@qq.com>
Date: Wed, 8 Apr 2020 11:18:09 +0800
Subject: [PATCH] remove empty registry cache

Signed-off-by: v_dylanxu <136539068@qq.com>
---
 .../ai/fate/register/common/AbstractRegistry.java   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/register/src/main/java/com/webank/ai/fate/register/common/AbstractRegistry.java b/register/src/main/java/com/webank/ai/fate/register/common/AbstractRegistry.java
index 96802929..f7cae18e 100644
--- a/register/src/main/java/com/webank/ai/fate/register/common/AbstractRegistry.java
+++ b/register/src/main/java/com/webank/ai/fate/register/common/AbstractRegistry.java
@@ -67,7 +67,7 @@ public AbstractRegistry(URL url) {
         setUrl(url);
         // Start file save timer
         syncSaveFile = url.getParameter(REGISTRY_FILESAVE_SYNC_KEY, false);
-        String filename = url.getParameter(FILE_KEY, System.getProperty(USER_HOME) + "/.fate/fate-registry-" + url.getParameter(PROJECT_KEY) + "-" + url.getAddress() + ".cache");
+        String filename = url.getParameter(FILE_KEY, System.getProperty(USER_HOME) + "/.fate/fate-registry-" + url.getParameter(PROJECT_KEY) + "-" + url.getHost() + "-" + url.getPort() + ".cache");
         File file = null;
         if (StringUtils.isNotEmpty(filename)) {
             file = new File(filename);
@@ -441,7 +441,9 @@ private void saveProperties(URL url) {
                         if (buf.length() > 0) {
                             buf.append(URL_SEPARATOR);
                         }
-                        buf.append(u.toFullString());
+                        if (!EMPTY_PROTOCOL.equals(u.getProtocol())) {
+                            buf.append(u.toFullString());
+                        }
                     }
                 }
             }
@@ -449,7 +451,12 @@ private void saveProperties(URL url) {
             if (logger.isDebugEnabled()) {
                 logger.debug("properties set property key {} value {}", url.getServiceKey(), buf.toString());
             }
-            properties.setProperty(url.getServiceKey(), buf.toString());
+
+            if (buf.length() == 0) {
+                properties.remove(url.getServiceKey());
+            } else {
+                properties.setProperty(url.getServiceKey(), buf.toString());
+            }
             long version = lastCacheChanged.incrementAndGet();
             if (syncSaveFile) {
                 doSaveProperties(version);