github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/redisson-reference' into redisson-reference

Browse Source
pull/605/head
jackygurui 9 years ago
parent 5677374e49 a88db7778a
commit e0b2c9c643
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
redisson/src/main/java/org/redisson/command/CommandBatchService.java
Unescape Escape View File

@ -185,7 +185,7 @@ public class CommandBatchService extends CommandReactiveService {
? RedissonObjectFactory.<Object>fromReference(redisson, (RedissonReference) entryResult) ? RedissonObjectFactory.<Object>fromReference(redisson, (RedissonReference) entryResult)
: RedissonObjectFactory.<Object>fromReference(redissonReactive, (RedissonReference) entryResult)); : RedissonObjectFactory.<Object>fromReference(redissonReactive, (RedissonReference) entryResult));
} else { } else {
result.add(commandEntry.getPromise().getNow()); result.add(entryResult);
} }
} }
promise.setSuccess(result); promise.setSuccess(result);

6
redisson/src/main/java/org/redisson/liveobject/core/AccessorInterceptor.java
Unescape Escape View File

@ -18,7 +18,6 @@ package org.redisson.liveobject.core;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.AbstractMap; import java.util.AbstractMap;
import java.util.BitSet;
import java.util.Collection; import java.util.Collection;
import java.util.Deque; import java.util.Deque;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@ -44,7 +43,6 @@ import org.redisson.RedissonSet;
import org.redisson.RedissonSortedSet; import org.redisson.RedissonSortedSet;
import org.redisson.api.RLiveObject; import org.redisson.api.RLiveObject;
import org.redisson.client.codec.Codec; import org.redisson.client.codec.Codec;
import org.redisson.api.RBitSet;
import org.redisson.api.RMap; import org.redisson.api.RMap;
import org.redisson.api.RObject; import org.redisson.api.RObject;
import org.redisson.api.RedissonClient; import org.redisson.api.RedissonClient;
@ -130,7 +128,7 @@ public class AccessorInterceptor {
} }
Object arg = args[0]; Object arg = args[0];
if (!(arg instanceof RObject) if (!(arg instanceof RObject)
&& (arg instanceof BitSet || arg instanceof Collection || arg instanceof Map) && (arg instanceof Collection || arg instanceof Map)
&& TransformationMode.ANNOTATION_BASED && TransformationMode.ANNOTATION_BASED
.equals(me.getClass().getSuperclass() .equals(me.getClass().getSuperclass()
.getAnnotation(REntity.class).fieldTransformation())) { .getAnnotation(REntity.class).fieldTransformation())) {
@ -148,8 +146,6 @@ public class AccessorInterceptor {
fieldName, fieldName,
arg), arg),
entry.getValue()); entry.getValue());
if (obj instanceof RBitSet) {
((RBitSet) obj).set((BitSet) args[0]);
} else if (obj instanceof Collection) { } else if (obj instanceof Collection) {
((Collection) obj).addAll((Collection) arg); ((Collection) obj).addAll((Collection) arg);
} else { } else {

Write Preview
Loading…
Cancel
Save