|
19 | 19 | import java.io.IOException; |
20 | 20 | import java.net.http.HttpRequest; |
21 | 21 | import java.net.http.HttpResponse; |
| 22 | +import java.util.concurrent.locks.Lock; |
| 23 | +import java.util.concurrent.locks.ReentrantLock; |
22 | 24 | import java.util.function.Consumer; |
23 | 25 |
|
24 | 26 | class SynchronizedCache implements Cache { |
25 | 27 | private final Cache delegate; |
| 28 | + private final Lock lock = new ReentrantLock(); |
26 | 29 |
|
27 | 30 | SynchronizedCache(Cache delegate) { |
28 | 31 | this.delegate = delegate; |
29 | 32 | } |
30 | 33 |
|
31 | 34 | @Override |
32 | | - public synchronized CacheEntry get(HttpRequest request) { |
33 | | - return delegate.get(request); |
| 35 | + public CacheEntry get(HttpRequest request) { |
| 36 | + lock.lock(); |
| 37 | + try { |
| 38 | + return delegate.get(request); |
| 39 | + } finally { |
| 40 | + lock.unlock(); |
| 41 | + } |
34 | 42 | } |
35 | 43 |
|
36 | 44 | @Override |
37 | | - public synchronized void put(HttpRequest request, CacheEntry entry) { |
38 | | - delegate.put(request, entry); |
| 45 | + public void put(HttpRequest request, CacheEntry entry) { |
| 46 | + lock.lock(); |
| 47 | + try { |
| 48 | + delegate.put(request, entry); |
| 49 | + } finally { |
| 50 | + lock.unlock(); |
| 51 | + } |
39 | 52 | } |
40 | 53 |
|
41 | 54 | @Override |
42 | | - public synchronized void evict(HttpRequest request) { |
43 | | - delegate.evict(request); |
| 55 | + public void evict(HttpRequest request) { |
| 56 | + lock.lock(); |
| 57 | + try { |
| 58 | + delegate.evict(request); |
| 59 | + } finally { |
| 60 | + lock.unlock(); |
| 61 | + } |
44 | 62 | } |
45 | 63 |
|
46 | 64 | @Override |
47 | | - public synchronized void evictAll(HttpRequest request) { |
48 | | - delegate.evictAll(request); |
| 65 | + public void evictAll(HttpRequest request) { |
| 66 | + lock.lock(); |
| 67 | + try { |
| 68 | + delegate.evictAll(request); |
| 69 | + } finally { |
| 70 | + lock.unlock(); |
| 71 | + } |
49 | 72 | } |
50 | 73 |
|
51 | 74 | @Override |
52 | | - public synchronized void evictAll() { |
53 | | - delegate.evictAll(); |
| 75 | + public void evictAll() { |
| 76 | + lock.lock(); |
| 77 | + try { |
| 78 | + delegate.evictAll(); |
| 79 | + } finally { |
| 80 | + lock.unlock(); |
| 81 | + } |
54 | 82 | } |
55 | 83 |
|
56 | 84 | @Override |
@@ -79,8 +107,13 @@ public Consumer<T> finisher() { |
79 | 107 | } |
80 | 108 |
|
81 | 109 | @Override |
82 | | - public synchronized void close() throws IOException { |
83 | | - delegate.close(); |
| 110 | + public void close() throws IOException { |
| 111 | + lock.lock(); |
| 112 | + try { |
| 113 | + delegate.close(); |
| 114 | + } finally { |
| 115 | + lock.unlock(); |
| 116 | + } |
84 | 117 | } |
85 | 118 |
|
86 | 119 | Cache delegate() { |
|
0 commit comments