Skip to content

Commit b297ab5

Browse files
Update SoftCache.java
fix: #2403
1 parent 1a81dec commit b297ab5

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/main/java/org/apache/ibatis/cache/decorators/SoftCache.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,10 @@ public Object getObject(Object key) {
8787
@Override
8888
public Object removeObject(Object key) {
8989
removeGarbageCollectedItems();
90-
return delegate.removeObject(key);
90+
// See #2403 fix return value
91+
@SuppressWarnings("unchecked") // assumed delegate cache is totally managed by this cache
92+
SoftReference<Object> softReference = (SoftReference<Object>) delegate.removeObject(key);
93+
return softReference == null ? null : softReference.get();
9194
}
9295

9396
@Override

0 commit comments

Comments
 (0)