diff --git a/redisson/src/main/java/org/redisson/command/CommandBatchService.java b/redisson/src/main/java/org/redisson/command/CommandBatchService.java index b15146971..a38b76cec 100644 --- a/redisson/src/main/java/org/redisson/command/CommandBatchService.java +++ b/redisson/src/main/java/org/redisson/command/CommandBatchService.java @@ -185,7 +185,7 @@ public class CommandBatchService extends CommandReactiveService { ? RedissonObjectFactory.fromReference(redisson, (RedissonReference) entryResult) : RedissonObjectFactory.fromReference(redissonReactive, (RedissonReference) entryResult)); } else { - result.add(commandEntry.getPromise().getNow()); + result.add(entryResult); } } promise.setSuccess(result); diff --git a/redisson/src/main/java/org/redisson/liveobject/core/AccessorInterceptor.java b/redisson/src/main/java/org/redisson/liveobject/core/AccessorInterceptor.java index 3fb9cb450..c649e4585 100644 --- a/redisson/src/main/java/org/redisson/liveobject/core/AccessorInterceptor.java +++ b/redisson/src/main/java/org/redisson/liveobject/core/AccessorInterceptor.java @@ -18,7 +18,6 @@ package org.redisson.liveobject.core; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.AbstractMap; -import java.util.BitSet; import java.util.Collection; import java.util.Deque; import java.util.LinkedHashMap; @@ -44,7 +43,6 @@ import org.redisson.RedissonSet; import org.redisson.RedissonSortedSet; import org.redisson.api.RLiveObject; import org.redisson.client.codec.Codec; -import org.redisson.api.RBitSet; import org.redisson.api.RMap; import org.redisson.api.RObject; import org.redisson.api.RedissonClient; @@ -130,7 +128,7 @@ public class AccessorInterceptor { } Object arg = args[0]; if (!(arg instanceof RObject) - && (arg instanceof BitSet || arg instanceof Collection || arg instanceof Map) + && (arg instanceof Collection || arg instanceof Map) && TransformationMode.ANNOTATION_BASED .equals(me.getClass().getSuperclass() .getAnnotation(REntity.class).fieldTransformation())) { @@ -148,8 +146,6 @@ public class AccessorInterceptor { fieldName, arg), entry.getValue()); - if (obj instanceof RBitSet) { - ((RBitSet) obj).set((BitSet) args[0]); } else if (obj instanceof Collection) { ((Collection) obj).addAll((Collection) arg); } else {