Merge pull request #2438 from linmeitianqing/master

fix #2403

Author: harawata

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

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2021 the original author or authors.
+ *    Copyright 2009-2022 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -87,7 +87,9 @@ public Object getObject(Object key) {
   @Override
   public Object removeObject(Object key) {
     removeGarbageCollectedItems();
-    return delegate.removeObject(key);
+    @SuppressWarnings("unchecked")
+    SoftReference<Object> softReference = (SoftReference<Object>) delegate.removeObject(key);
+    return softReference == null ? null : softReference.get();
   }
 
   @Override

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

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2021 the original author or authors.
+ *    Copyright 2009-2022 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -86,7 +86,9 @@ public Object getObject(Object key) {
   @Override
   public Object removeObject(Object key) {
     removeGarbageCollectedItems();
-    return delegate.removeObject(key);
+    @SuppressWarnings("unchecked")
+    WeakReference<Object> weakReference = (WeakReference<Object>) delegate.removeObject(key);
+    return weakReference == null ? null : weakReference.get();
   }
 
   @Override