Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'DATAREDIS-117' of github.com:porcelijn/spring-data-redis into porcelijn-DATAREDIS-117

Browse Source 
Conflicts:
	src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java
	src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionIntegrationTests.java
This commit is contained in:
Jennifer Hickey
2013-03-19 09:46:04 -07:00
parent c05c0aaaa0 27a7ab0738
commit 9642b7ea72
4 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java
View File

@@ -1048,14 +1048,14 @@ public class JedisConnection implements RedisConnection {
public Long decrBy(byte[] key, long value) {
try {
if (isQueueing()) {
transaction.decrBy(key, (int) value);
transaction.decrBy(key, value);
return null;
}
if (isPipelined()) {
pipeline.decrBy(key, (int) value);
pipeline.decrBy(key, value);
return null;
}
return jedis.decrBy(key, (int) value);
return jedis.decrBy(key, value);
} catch (Exception ex) {
throw convertJedisAccessException(ex);
}
@@ -1082,14 +1082,14 @@ public class JedisConnection implements RedisConnection {
public Long incrBy(byte[] key, long value) {
try {
if (isQueueing()) {
transaction.incrBy(key, (int) value);
transaction.incrBy(key, value);
return null;
}
if (isPipelined()) {
pipeline.incrBy(key, (int) value);
pipeline.incrBy(key, value);
return null;
}
return jedis.incrBy(key, (int) value);
return jedis.incrBy(key, value);
} catch (Exception ex) {
throw convertJedisAccessException(ex);
}
@@ -2254,14 +2254,14 @@ public class JedisConnection implements RedisConnection {
public Long hIncrBy(byte[] key, byte[] field, long delta) {
try {
if (isQueueing()) {
transaction.hincrBy(key, field, (int) delta);
transaction.hincrBy(key, field, delta);
return null;
}
if (isPipelined()) {
pipeline.hincrBy(key, field, (int) delta);
pipeline.hincrBy(key, field, delta);
return null;
}
return jedis.hincrBy(key, field, (int) delta);
return jedis.hincrBy(key, field, delta);
} catch (Exception ex) {
throw convertJedisAccessException(ex);
}
@@ -2437,4 +2437,4 @@ public class JedisConnection implements RedisConnection {
throw new RedisSubscribedConnectionException("Cannot execute command - connection is subscribed");
}
}
}
}