Skip to content

Commit b9f1265

Browse files
authored
Merge pull request mybatis#284 from hazendaz/master
Small cleanup for ehcache 3
2 parents 5cab92e + cf108d6 commit b9f1265

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<groupId>org.mybatis.caches</groupId>
3131
<artifactId>mybatis-ehcache</artifactId>
32-
<version>1.3.2-SNAPSHOT</version>
32+
<version>2.0.0-SNAPSHOT</version>
3333

3434
<name>mybatis-ehcache</name>
3535
<description>Ehcache support for MyBatis Cache</description>
@@ -68,7 +68,7 @@
6868
<module.name>org.mybatis.caches.ehcache</module.name>
6969

7070
<!-- Reproducible Builds -->
71-
<project.build.outputTimestamp>1763919261</project.build.outputTimestamp>
71+
<project.build.outputTimestamp>1773012811</project.build.outputTimestamp>
7272

7373
<!-- External Modules -->
7474
<slf4j.version>2.0.17</slf4j.version>

src/main/java/org/mybatis/caches/ehcache/AbstractEhcacheCache.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.concurrent.locks.ReadWriteLock;
2222

2323
import org.apache.ibatis.cache.Cache;
24+
import org.ehcache.Cache.Entry;
2425
import org.ehcache.PersistentCacheManager;
2526
import org.ehcache.config.builders.CacheConfigurationBuilder;
2627
import org.ehcache.config.builders.CacheManagerBuilder;
@@ -157,7 +158,7 @@ public Object getObject(Object key) {
157158
@Override
158159
public int getSize() {
159160
int count = 0;
160-
for (org.ehcache.Cache.Entry<Object, Object> ignored : getOrCreateCache()) {
161+
for (Entry<Object, Object> ignored : getOrCreateCache()) {
161162
count++;
162163
}
163164
return count;

0 commit comments

Comments
 (0)