From 4dcc0e7a9f4c7467b9b875f3dbdd07bf33fd96c5 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Wed, 27 Nov 2019 18:47:14 +0300
Subject: [PATCH] refactoring

---
 .../org/redisson/executor/ScheduledTasksService.java     | 2 +-
 .../main/java/org/redisson/executor/TasksService.java    | 9 +++++++++
 .../main/java/org/redisson/remote/BaseRemoteService.java | 3 +--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/executor/ScheduledTasksService.java b/redisson/src/main/java/org/redisson/executor/ScheduledTasksService.java
index a8a1b1255..d783a5480 100644
--- a/redisson/src/main/java/org/redisson/executor/ScheduledTasksService.java
+++ b/redisson/src/main/java/org/redisson/executor/ScheduledTasksService.java
@@ -131,7 +131,7 @@ public class ScheduledTasksService extends TasksService {
         if (requestId == null) {
             byte[] id = new byte[17];
             ThreadLocalRandom.current().nextBytes(id);
-            id[0] = 1;
+            id[0] = 01;
             return new RequestId(id);
         }
         return requestId;
diff --git a/redisson/src/main/java/org/redisson/executor/TasksService.java b/redisson/src/main/java/org/redisson/executor/TasksService.java
index b916228f2..7aa6146a1 100644
--- a/redisson/src/main/java/org/redisson/executor/TasksService.java
+++ b/redisson/src/main/java/org/redisson/executor/TasksService.java
@@ -30,6 +30,7 @@ import org.redisson.remote.*;
 
 import java.util.Arrays;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -171,6 +172,14 @@ public class TasksService extends BaseRemoteService {
           taskId.toString(), RedissonExecutorService.SHUTDOWN_STATE, RedissonExecutorService.TERMINATED_STATE);
     }
 
+    @Override
+    protected RequestId generateRequestId() {
+        byte[] id = new byte[17];
+        ThreadLocalRandom.current().nextBytes(id);
+        id[0] = 00;
+        return new RequestId(id);
+    }
+
     public RFuture<Boolean> cancelExecutionAsync(final RequestId requestId) {
         final RPromise<Boolean> result = new RedissonPromise<Boolean>();
         
diff --git a/redisson/src/main/java/org/redisson/remote/BaseRemoteService.java b/redisson/src/main/java/org/redisson/remote/BaseRemoteService.java
index 1e62dc4ed..263d45499 100644
--- a/redisson/src/main/java/org/redisson/remote/BaseRemoteService.java
+++ b/redisson/src/main/java/org/redisson/remote/BaseRemoteService.java
@@ -186,9 +186,8 @@ public abstract class BaseRemoteService {
     }
 
     protected RequestId generateRequestId() {
-        byte[] id = new byte[17];
+        byte[] id = new byte[16];
         ThreadLocalRandom.current().nextBytes(id);
-        id[0] = 00;
         return new RequestId(id);
     }