refactoring

redisson/src/main/java/org/redisson/QueueTransferService.java

@@ -28,27 +28,27 @@ public class QueueTransferService {
     private final Map<String, QueueTransferTask> tasks = new ConcurrentHashMap<>();
     
     public void schedule(String name, QueueTransferTask task) {
-        QueueTransferTask oldTask = tasks.putIfAbsent(name, task);
-        if (oldTask == null) {
-            task.start();
-        } else {
-            oldTask.getLock().execute(() -> {
-                oldTask.incUsage();
-            });
-        }
+        tasks.compute(name, (k, t) -> {
+            if (t == null) {
+                task.start();
+                return task;
+            }
+            t.incUsage();
+            return t;
+        });
     }
     
     public void remove(String name) {
-        QueueTransferTask task = tasks.get(name);
-        if (task == null) {
-            return;
-        }
+        tasks.compute(name, (k, task) -> {
+            if (task == null) {
+                return null;
+            }
 
-        task.getLock().execute(() -> {
             if (task.decUsage() == 0) {
-                tasks.remove(name, task);
                 task.stop();
+                return null;
             }
+            return task;
         });
     }
     

redisson/src/main/java/org/redisson/QueueTransferTask.java

@@ -22,7 +22,6 @@ import org.redisson.api.RTopic;
 import org.redisson.api.listener.BaseStatusListener;
 import org.redisson.api.listener.MessageListener;
 import org.redisson.connection.ServiceManager;
-import org.redisson.misc.WrappedLock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -62,8 +61,7 @@ public abstract class QueueTransferTask {
     private int usage = 1;
     private final AtomicReference<TimeoutTask> lastTimeout = new AtomicReference<TimeoutTask>();
     private final ServiceManager serviceManager;
-    private final WrappedLock lock = new WrappedLock();
-    
+
     public QueueTransferTask(ServiceManager serviceManager) {
         super();
         this.serviceManager = serviceManager;
@@ -157,7 +155,4 @@ public abstract class QueueTransferTask {
         });
     }
 
-    public WrappedLock getLock() {
-        return lock;
-    }
 }