From eae1a7910c89f357c7c05ce72e75fc7c64b36323 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Wed, 29 Aug 2012 15:53:57 +0800
Subject: [PATCH] Checks for overly complicated boolean return statements.

---
 .../com/alibaba/druid/filter/encoding/CharsetConvert.java   | 6 +-----
 .../alibaba/druid/pool/ha/cobar/CobarFailureDetecter.java   | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/filter/encoding/CharsetConvert.java b/src/main/java/com/alibaba/druid/filter/encoding/CharsetConvert.java
index fec7c35567..de21e7cf49 100644
--- a/src/main/java/com/alibaba/druid/filter/encoding/CharsetConvert.java
+++ b/src/main/java/com/alibaba/druid/filter/encoding/CharsetConvert.java
@@ -73,11 +73,7 @@ public class CharsetConvert {
      * @return boolean
      */
     public boolean isEmpty(String s) {
-        if (s == null || "".equals(s)) {
-            return true;
-        } else {
-            return false;
-        }
+        return s == null || "".equals(s);
     }
 
 }
diff --git a/src/main/java/com/alibaba/druid/pool/ha/cobar/CobarFailureDetecter.java b/src/main/java/com/alibaba/druid/pool/ha/cobar/CobarFailureDetecter.java
index 52a68a69fd..fd620dbc20 100644
--- a/src/main/java/com/alibaba/druid/pool/ha/cobar/CobarFailureDetecter.java
+++ b/src/main/java/com/alibaba/druid/pool/ha/cobar/CobarFailureDetecter.java
@@ -56,11 +56,7 @@ public class CobarFailureDetecter extends DefaultDataSourceFailureDetecter {
 
             String status = rs.getString(1);
 
-            if ("on".equalsIgnoreCase(status)) {
-                return true;
-            } else {
-                return false;
-            }
+            return "on".equalsIgnoreCase(status);
         } catch (Exception ex) {
             LOG.error("check datasource valid errror", ex);
             return false;