Refactoring. #680

redisson · Oct 25, 2016 · 937215e · 937215e
1 parent b58c058
commit 937215e
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/redisson/src/main/java/org/redisson/connection/pool/ConnectionPool.java b/redisson/src/main/java/org/redisson/connection/pool/ConnectionPool.java
@@ -109,7 +109,8 @@ private void createConnection(final boolean checkFreezed, final AtomicInteger re
 
             @Override
             public void run() {
-                RFuture<T> promise = createConnection(entry, null);
+                RPromise<T> promise = connectionManager.newPromise();
+                createConnection(entry, promise);
                 promise.addListener(new FutureListener<T>() {
                     @Override
                     public void operationComplete(Future<T> future) throws Exception {
@@ -159,7 +160,7 @@ protected ClientConnectionsEntry getEntry() {
 
     public RFuture<T> get() {
         for (int j = entries.size() - 1; j >= 0; j--) {
-            ClientConnectionsEntry entry = getEntry();
+            final ClientConnectionsEntry entry = getEntry();
             if (!entry.isFreezed() 
                     && tryAcquireConnection(entry)) {
                 final RPromise<T> result = connectionManager.newPromise();
@@ -238,13 +239,7 @@ private void connectTo(ClientConnectionsEntry entry, RPromise<T> promise) {
         createConnection(entry, promise);
     }
 
-    private RFuture<T> createConnection(final ClientConnectionsEntry entry, RPromise<T> ppromise) {
+    private void createConnection(final ClientConnectionsEntry entry, final RPromise<T> promise) {
-        final RPromise<T> promise;
-        if (ppromise != null) {
-            promise = ppromise;
-        } else {
-            promise = connectionManager.newPromise();
-        }
         RFuture<T> connFuture = connect(entry);
         connFuture.addListener(new FutureListener<T>() {
             @Override
@@ -263,7 +258,6 @@ public void operationComplete(Future<T> future) throws Exception {
                 connectedSuccessful(entry, promise, conn);
             }
         });
-        return promise;
     }
 
     private void connectedSuccessful(ClientConnectionsEntry entry, RPromise<T> promise, T conn) {