Browse Source

polishing

pull/442/merge
Stephane Nicoll 12 years ago
parent
commit
6a8cf28665
  1. 6
      spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java

6
spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java vendored

@ -397,7 +397,8 @@ public abstract class CacheAspectSupport implements InitializingBean, Applicatio @@ -397,7 +397,8 @@ public abstract class CacheAspectSupport implements InitializingBean, Applicatio
if (StringUtils.hasText(operation.getKeyGenerator())) { // TODO: exception mgt?
this.operationKeyGenerator = BeanFactoryAnnotationUtils.qualifiedBeanOfType(
applicationContext, KeyGenerator.class, operation.getKeyGenerator());
} else {
}
else {
this.operationKeyGenerator = keyGenerator;
}
if (StringUtils.hasText(operation.getCacheManager())) {
@ -433,7 +434,8 @@ public abstract class CacheAspectSupport implements InitializingBean, Applicatio @@ -433,7 +434,8 @@ public abstract class CacheAspectSupport implements InitializingBean, Applicatio
String unless = "";
if (this.operation instanceof CacheableOperation) {
unless = ((CacheableOperation) this.operation).getUnless();
} else if (this.operation instanceof CachePutOperation) {
}
else if (this.operation instanceof CachePutOperation) {
unless = ((CachePutOperation) this.operation).getUnless();
}
if (StringUtils.hasText(unless)) {

Loading…
Cancel
Save