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

DATAREDIS-1214 - Fix null return value of GEODIST command.

Browse Source 
Original pull request: #565.
This commit is contained in:
Christoph Strobl
2020-10-01 14:52:51 +02:00
committed by Mark Paluch
parent b26a93280a
commit 67fc916512
4 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/springframework/data/redis/connection/jedis/JedisGeoCommands.java
View File

@@ -163,7 +163,8 @@ class JedisGeoCommands implements RedisGeoCommands {
return null;
}
return distanceConverter.convert(connection.getJedis().geodist(key, member1, member2));
Double distance = connection.getJedis().geodist(key, member1, member2);
return distance != null ? distanceConverter.convert(distance) : null;
} catch (Exception ex) {
throw convertJedisAccessException(ex);
}
@@ -196,7 +197,8 @@ class JedisGeoCommands implements RedisGeoCommands {
return null;
}
return distanceConverter.convert(connection.getJedis().geodist(key, member1, member2, geoUnit));
Double distance = connection.getJedis().geodist(key, member1, member2, geoUnit);
return distance != null ? distanceConverter.convert(distance) : null;
} catch (Exception ex) {
throw convertJedisAccessException(ex);
}

4
src/main/java/org/springframework/data/redis/connection/lettuce/LettuceGeoCommands.java
View File

@@ -176,7 +176,9 @@ class LettuceGeoCommands implements RedisGeoCommands {
distanceConverter));
return null;
}
return distanceConverter.convert(getConnection().geodist(key, member1, member2, geoUnit));
Double distance = getConnection().geodist(key, member1, member2, geoUnit);
return distance != null ? distanceConverter.convert(distance) : null;
} catch (Exception ex) {
throw convertLettuceAccessException(ex);
}