From 8dd1f22b9056c0ca77f73bd3f370b493f98ea433 Mon Sep 17 00:00:00 2001
From: cherrylzhao <zhaojunv3@126.com>
Date: Fri, 10 May 2019 17:17:26 +0800
Subject: [PATCH] for #2331 revert ShardingDataSourceNames modifaction.

---
 .../core/rule/ShardingDataSourceNames.java               | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/rule/ShardingDataSourceNames.java b/sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/rule/ShardingDataSourceNames.java
index 3c1f354132..79d5acf97d 100644
--- a/sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/rule/ShardingDataSourceNames.java
+++ b/sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/rule/ShardingDataSourceNames.java
@@ -17,7 +17,6 @@
 
 package org.apache.shardingsphere.core.rule;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.Lists;
 import lombok.Getter;
 import org.apache.shardingsphere.api.config.masterslave.MasterSlaveRuleConfiguration;
@@ -53,20 +52,16 @@ public final class ShardingDataSourceNames {
             result.removeAll(each.getSlaveDataSourceNames());
             result.add(each.getName());
         }
-        Optional<String> defaultDataSourceName = Optional.fromNullable(shardingRuleConfig.getDefaultDataSourceName());
-        if (defaultDataSourceName.isPresent()) {
-            result.remove(defaultDataSourceName.get());
-        }
         return result;
     }
     
     /**
      * Get default data source name.
-     * 
+     *
      * @return default data source name
      */
     public String getDefaultDataSourceName() {
-        return Optional.fromNullable(shardingRuleConfig.getDefaultDataSourceName()).or(dataSourceNames.iterator().next());
+        return 1 == dataSourceNames.size() ? dataSourceNames.iterator().next() : shardingRuleConfig.getDefaultDataSourceName();
     }
     
     /**
-- 
GitLab