Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2018-02-26 13:24:50 +01:00
parent 06e2bada0a
commit 0bc7c47bea
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java vendored
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -41,13 +41,15 @@ public class EhCacheCache implements Cache {
/** /**
* Create an {@link EhCacheCache} instance. * Create an {@link EhCacheCache} instance.
* @param ehcache backing Ehcache instance * @param ehcache the backing Ehcache instance
*/ */
public EhCacheCache(Ehcache ehcache) { public EhCacheCache(Ehcache ehcache) {
Assert.notNull(ehcache, "Ehcache must not be null"); Assert.notNull(ehcache, "Ehcache must not be null");
Status status = ehcache.getStatus(); Status status = ehcache.getStatus();
Assert.isTrue(Status.STATUS_ALIVE.equals(status), if (!Status.STATUS_ALIVE.equals(status)) {
"An 'alive' Ehcache is required - current cache is " + status.toString()); throw new IllegalArgumentException(
"An 'alive' Ehcache is required - current cache is " + status.toString());
}
this.cache = ehcache; this.cache = ehcache;
} }
@@ -78,7 +80,7 @@ public class EhCacheCache implements Cache {
else { else {
this.cache.acquireWriteLockOnKey(key); this.cache.acquireWriteLockOnKey(key);
try { try {
element = lookup(key); // One more attempt with the write lock element = lookup(key); // one more attempt with the write lock
if (element != null) { if (element != null) {
return (T) element.getObjectValue(); return (T) element.getObjectValue();
} }
@@ -111,7 +113,8 @@ public class EhCacheCache implements Cache {
Element element = this.cache.get(key); Element element = this.cache.get(key);
Object value = (element != null ? element.getObjectValue() : null); Object value = (element != null ? element.getObjectValue() : null);
if (value != null && type != null && !type.isInstance(value)) { if (value != null && type != null && !type.isInstance(value)) {
throw new IllegalStateException("Cached value is not of required type [" + type.getName() + "]: " + value); throw new IllegalStateException(
"Cached value is not of required type [" + type.getName() + "]: " + value);
} }
return (T) value; return (T) value;
} }

7
spring-context/src/main/java/org/springframework/cache/support/AbstractValueAdaptingCache.java vendored
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -62,7 +62,8 @@ public abstract class AbstractValueAdaptingCache implements Cache {
public <T> T get(Object key, Class<T> type) { public <T> T get(Object key, Class<T> type) {
Object value = fromStoreValue(lookup(key)); Object value = fromStoreValue(lookup(key));
if (value != null && type != null && !type.isInstance(value)) { if (value != null && type != null && !type.isInstance(value)) {
throw new IllegalStateException("Cached value is not of required type [" + type.getName() + "]: " + value); throw new IllegalStateException(
"Cached value is not of required type [" + type.getName() + "]: " + value);
} }
return (T) value; return (T) value;
} }
@@ -70,7 +71,7 @@ public abstract class AbstractValueAdaptingCache implements Cache {
/** /**
* Perform an actual lookup in the underlying store. * Perform an actual lookup in the underlying store.
* @param key the key whose associated value is to be returned * @param key the key whose associated value is to be returned
* @return the raw store value for the key * @return the raw store value for the key, or {@code null} if none
*/ */
protected abstract Object lookup(Object key); protected abstract Object lookup(Object key);