You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2016/02/05 07:35:56 UTC
cayenne git commit: EhCache - better argument checking
Repository: cayenne
Updated Branches:
refs/heads/master 5d3e141a9 -> 04c84752d
EhCache - better argument checking
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/04c84752
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/04c84752
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/04c84752
Branch: refs/heads/master
Commit: 04c84752d17bb51b2859cb77712086661fd7bd52
Parents: 5d3e141
Author: aadamchik <aa...@apache.org>
Authored: Fri Feb 5 09:33:11 2016 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Fri Feb 5 09:33:11 2016 +0300
----------------------------------------------------------------------
.../apache/cayenne/cache/EhCacheQueryCache.java | 21 ++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/04c84752/cayenne-server/src/main/java/org/apache/cayenne/cache/EhCacheQueryCache.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/cache/EhCacheQueryCache.java b/cayenne-server/src/main/java/org/apache/cayenne/cache/EhCacheQueryCache.java
index 0424b09..cc41413 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/cache/EhCacheQueryCache.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/cache/EhCacheQueryCache.java
@@ -19,6 +19,7 @@
package org.apache.cayenne.cache;
import java.util.List;
+import java.util.Objects;
import net.sf.ehcache.Cache;
import net.sf.ehcache.CacheManager;
@@ -142,19 +143,19 @@ public class EhCacheQueryCache implements QueryCache {
/**
* @since 4.0
*/
- protected String cacheName(String key, String... cacheGroups) {
- if (cacheGroups != null && cacheGroups.length > 0) {
+ protected String cacheName(String key, String... cacheGroups) {
+ if (cacheGroups != null && cacheGroups.length > 0) {
- if (cacheGroups.length > 1) {
- logger.warn("multiple cache groups per key '" + key + "', ignoring all but the first one: "
- + cacheGroups[0]);
- }
+ if (cacheGroups.length > 1) {
+ logger.warn("multiple cache groups per key '" + key + "', ignoring all but the first one: "
+ + cacheGroups[0]);
+ }
- return cacheGroups[0];
- }
+ return Objects.requireNonNull(cacheGroups[0], "Null cache group");
+ }
- return DEFAULT_CACHE_NAME;
- }
+ return DEFAULT_CACHE_NAME;
+ }
@SuppressWarnings("rawtypes")
public void put(QueryMetadata metadata, List results) {