More consistent handling of OperationTimeoutException in MemcachedHttpCacheStorage

ok2c · ok2c · commit 6105852b6b13 · 2023-09-29T15:06:12.000+02:00
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedHttpCacheStorage.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedHttpCacheStorage.java
@@ -208,8 +208,12 @@ protected byte[] getStorageObject(final CASValue<Object> casValue) throws Resour
     @Override
     protected boolean updateCAS(
             final String storageKey, final CASValue<Object> casValue, final byte[] storageObject) throws ResourceIOException {
-        final CASResponse casResult = client.cas(storageKey, casValue.getCas(), storageObject);
-        return casResult == CASResponse.OK;
+        try {
+            final CASResponse casResult = client.cas(storageKey, casValue.getCas(), storageObject);
+            return casResult == CASResponse.OK;
+        } catch (final OperationTimeoutException ex) {
+            throw new MemcachedOperationTimeoutException(ex);
+        }
     }
 
     @Override
@@ -219,12 +223,16 @@ protected void delete(final String storageKey) throws ResourceIOException {
 
     @Override
     protected Map<String, byte[]> bulkRestore(final Collection<String> storageKeys) throws ResourceIOException {
-        final Map<String, ?> storageObjectMap = client.getBulk(storageKeys);
-        final Map<String, byte[]> resultMap = new HashMap<>(storageObjectMap.size());
-        for (final Map.Entry<String, ?> resultEntry: storageObjectMap.entrySet()) {
-            resultMap.put(resultEntry.getKey(), castAsByteArray(resultEntry.getValue()));
+        try {
+            final Map<String, ?> storageObjectMap = client.getBulk(storageKeys);
+            final Map<String, byte[]> resultMap = new HashMap<>(storageObjectMap.size());
+            for (final Map.Entry<String, ?> resultEntry: storageObjectMap.entrySet()) {
+                resultMap.put(resultEntry.getKey(), castAsByteArray(resultEntry.getValue()));
+            }
+            return resultMap;
+        } catch (final OperationTimeoutException ex) {
+            throw new MemcachedOperationTimeoutException(ex);
         }
-        return resultMap;
     }
 
 }
