diff --git a/src/main/java/com/alibaba/druid/filter/config/ConfigFilter.java b/src/main/java/com/alibaba/druid/filter/config/ConfigFilter.java index 3e7538f7f3..aad18aad7f 100644 --- a/src/main/java/com/alibaba/druid/filter/config/ConfigFilter.java +++ b/src/main/java/com/alibaba/druid/filter/config/ConfigFilter.java @@ -169,7 +169,7 @@ public class ConfigFilter extends FilterAdapter { InputStream inStream = null; try { boolean xml = false; - if (filePath.startsWith("http://")) { + if (filePath.startsWith("http://") || filePath.startsWith("https://")) { URL url = new URL(filePath); inStream = url.openStream(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigLoadFilterTest6.java b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigLoadFilterTest6.java new file mode 100644 index 0000000000..7cace6ecf6 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigLoadFilterTest6.java @@ -0,0 +1,39 @@ +package com.alibaba.druid.bvt.filter.config; + +import java.sql.Connection; + +import com.alibaba.druid.mock.MockDriver; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcUtils; + +import junit.framework.Assert; +import junit.framework.TestCase; + +public class ConfigLoadFilterTest6 extends TestCase { + + private DruidDataSource dataSource; + + protected void setUp() throws Exception { + dataSource = new DruidDataSource(); + dataSource.setUrl("druid-configFile=https://raw.github.com/AlibabaTech/druid/master/src/test/resources/bvt/config/config-0.properties"); + } + + protected void tearDown() throws Exception { + JdbcUtils.close(dataSource); + } + + public void test_http_config() throws Exception { + Assert.assertEquals(true, dataSource.isTestOnBorrow()); // default + Assert.assertEquals(8, dataSource.getMaxActive()); + + dataSource.init(); + + Assert.assertEquals(false, dataSource.isTestOnBorrow()); + Assert.assertEquals(10, dataSource.getMaxActive()); + Assert.assertEquals("jdbc:mock:config-0", dataSource.getUrl()); + Assert.assertEquals(MockDriver.instance, dataSource.getDriver()); + + Connection conn = dataSource.getConnection(); + conn.close(); + } +}