diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index fb9e333ff8..6b78dd5914 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -46,8 +46,6 @@ import javax.security.auth.callback.NameCallback; import javax.security.auth.callback.PasswordCallback; import javax.sql.DataSource; -import org.h2.util.StringUtils; - import com.alibaba.druid.filter.Filter; import com.alibaba.druid.filter.FilterChainImpl; import com.alibaba.druid.filter.FilterManager; @@ -65,6 +63,7 @@ import com.alibaba.druid.util.DruidPasswordCallback; import com.alibaba.druid.util.Histogram; import com.alibaba.druid.util.IOUtils; import com.alibaba.druid.util.JdbcUtils; +import com.alibaba.druid.util.StringUtils; /** * @author wenshao diff --git a/src/main/java/com/alibaba/druid/util/StringUtils.java b/src/main/java/com/alibaba/druid/util/StringUtils.java index 1b9f0a8108..38a79edd7d 100644 --- a/src/main/java/com/alibaba/druid/util/StringUtils.java +++ b/src/main/java/com/alibaba/druid/util/StringUtils.java @@ -183,4 +183,11 @@ public class StringUtils { public static void main(String args[]) { System.out.println(JSON.toJSONString(getParameters("test?t=1&f=").get("t"))); } + + public static boolean equals(String a, String b) { + if (a == null) { + return b == null; + } + return a.equals(b); + } }