MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix potential NullPointerException in RateLimiter

This commit is contained in:
Chris Eager 2021-04-30 16:11:08 -05:00 committed by Chris Eager
parent cd6b2512e1
commit 0e6cfb460d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
service/src/main/java/org/whispersystems/textsecuregcm/limits/RateLimiter.java
View File

@ -132,8 +132,10 @@ public class RateLimiter {
logger.warn("Deserialization error", e); logger.warn("Deserialization error", e);
} }
if (secondaryCacheCluster != null) {
try { try {
final String serialized = secondaryCacheCluster.withCluster(connection -> connection.sync().get(getBucketName(key))); final String serialized = secondaryCacheCluster
.withCluster(connection -> connection.sync().get(getBucketName(key)));
if (serialized != null) { if (serialized != null) {
return LeakyBucket.fromSerialized(mapper, serialized); return LeakyBucket.fromSerialized(mapper, serialized);
@ -141,6 +143,7 @@ public class RateLimiter {
} catch (IOException e) { } catch (IOException e) {
logger.warn("Deserialization error", e); logger.warn("Deserialization error", e);
} }
}
return new LeakyBucket(bucketSize, leakRatePerMillis); return new LeakyBucket(bucketSize, leakRatePerMillis);
} }