Skip to content

Commit 21e50e9

Browse files
authored
Merge pull request #3615 from ebean-orm/feature/3612-redis-exception
#3612 Catch all RedisException (rather than only IOException)
2 parents d9a4524 + 88a47bf commit 21e50e9

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

ebean-redis/src/main/java/io/ebean/redis/DuelCache.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.ebean.redis;
22

33
import io.ebean.cache.ServerCache;
4-
import io.ebean.cache.ServerCacheStatistics;
54
import io.ebean.meta.MetricVisitor;
65
import io.ebeaninternal.server.cache.DefaultServerCache;
76

ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ private class DNearCacheNotify implements NearCacheNotify {
281281
public void invalidateKeys(String cacheKey, Set<Object> keySet) {
282282
try {
283283
sendMessage(messageInvalidateKeys(cacheKey, keySet));
284-
} catch (IOException e) {
284+
} catch (Exception e) {
285285
logger.log(ERROR, "failed to transmit invalidateKeys() message", e);
286286
}
287287
}
@@ -290,7 +290,7 @@ public void invalidateKeys(String cacheKey, Set<Object> keySet) {
290290
public void invalidateKey(String cacheKey, Object id) {
291291
try {
292292
sendMessage(messageInvalidateKey(cacheKey, id));
293-
} catch (IOException e) {
293+
} catch (Exception e) {
294294
logger.log(ERROR, "failed to transmit invalidateKeys() message", e);
295295
}
296296
}
@@ -299,7 +299,7 @@ public void invalidateKey(String cacheKey, Object id) {
299299
public void invalidateClear(String cacheKey) {
300300
try {
301301
sendMessage(messageInvalidateClear(cacheKey));
302-
} catch (IOException e) {
302+
} catch (Exception e) {
303303
logger.log(ERROR, "failed to transmit invalidateKeys() message", e);
304304
}
305305
}
@@ -422,7 +422,7 @@ private void processNearCacheMessage(byte[] message) {
422422
throw new IllegalStateException("Unexpected message type ? " + msgType);
423423
}
424424

425-
} catch (IOException | ClassNotFoundException e) {
425+
} catch (Exception e) {
426426
logger.log(ERROR, "failed to decode near cache message [" + SafeEncoder.encode(message) + "] for cache:" + cacheKey, e);
427427
if (cacheKey != null) {
428428
nearCacheInvalidateClear(cacheKey);

0 commit comments

Comments
 (0)