Merge remote-tracking branch 'origin/master'

gudaoxuri · Aug 20, 2016 · fef1cef · fef1cef
2 parents 8ee66ac + f1cebea
commit fef1cef
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/modules/redis/src/main/scala/com/ecfront/ez/framework/service/redis/RedisProcessor.scala b/modules/redis/src/main/scala/com/ecfront/ez/framework/service/redis/RedisProcessor.scala
@@ -46,23 +46,23 @@ object RedisProcessor extends LazyLogging {
             simpleRedis.auth(auth, new Handler[AsyncResult[String]] {
               override def handle(event: AsyncResult[String]): Unit = {
                 if (event.succeeded()) {
-                  c.countDown()
                   resp = Resp.success("Redis client started")
+                  c.countDown()
                 } else {
                   logger.error("Redis client start fail.", event.cause())
-                  c.countDown()
                   resp = Resp.serverError(event.cause().getMessage)
+                  c.countDown()
                 }
               }
             })
           } else {
-            c.countDown()
             resp = Resp.success("Redis client started")
+            c.countDown()
           }
         } else {
           logger.error("Redis client start fail.", event.cause())
-          c.countDown()
           resp = Resp.serverError(event.cause().getMessage)
+          c.countDown()
         }
       }
     })