From 5d8ec202d47598d92c5914109d1a994561d3b56e Mon Sep 17 00:00:00 2001 From: lihongxu Date: Fri, 2 Jun 2017 17:15:55 +0800 Subject: [PATCH] refactor the method of decrypt --- .../com/alibaba/druid/filter/config/ConfigFilter.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) 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 f65503945a..87e5ab2815 100644 --- a/src/main/java/com/alibaba/druid/filter/config/ConfigFilter.java +++ b/src/main/java/com/alibaba/druid/filter/config/ConfigFilter.java @@ -137,8 +137,6 @@ public class ConfigFilter extends FilterAdapter { } public boolean isDecrypt(Properties connectinProperties, Properties configFileProperties) { - boolean decrypt = false; - String decrypterId = connectinProperties.getProperty(CONFIG_DECRYPT); if (decrypterId == null || decrypterId.length() == 0) { if (configFileProperties != null) { @@ -150,11 +148,7 @@ public class ConfigFilter extends FilterAdapter { decrypterId = System.getProperty(SYS_PROP_CONFIG_DECRYPT); } - if ("true".equals(decrypterId)) { - decrypt = true; - } - - return decrypt; + return Boolean.valueOf(decrypterId); } Properties loadPropertyFromConfigFile(Properties connectinProperties) {