创建数据源失败后，清除缓存

zhou-hao · zhou-hao · commit 26e2e60939ee · 2016-09-28T10:25:30.000+08:00
diff --git a/hsweb-web-datasource/src/main/java/org/hsweb/web/datasource/dynamic/DynamicDataSourceServiceImpl.java b/hsweb-web-datasource/src/main/java/org/hsweb/web/datasource/dynamic/DynamicDataSourceServiceImpl.java
@@ -64,6 +64,7 @@ public javax.sql.DataSource getDataSource(String id) {
     @PreDestroy
     public void destroyAll() throws Exception {
         cache.values().stream().map(CacheInfo::getDataSource).forEach(this::closeDataSource);
+        cache.clear();
     }
 
     protected void closeDataSource(javax.sql.CommonDataSource ds) {
@@ -156,6 +157,7 @@ protected javax.sql.DataSource createDataSource(DataSource dataSource) {
                 success[0] = true;
             } catch (AtomikosSQLException e) {
                 closeDataSource(dataSourceBean);
+                cache.remove(dataSource.getId());
             }
         }).start();
         //初始化检测
@@ -165,6 +167,7 @@ protected javax.sql.DataSource createDataSource(DataSource dataSource) {
                 if (!success[0]) {
                     logger.error("初始化jdbc超时:{}", dataSourceBean);
                     closeDataSource(dataSourceBean);
+                    cache.remove(dataSource.getId());
                 }
             } catch (Exception e) {
 
