opendev/gerrit
Code Issues Proposed changes

Don't rely on Ehcache CacheConfiguration clone()

Browse Source 
Its cleaner to not rely on cloning the cache configuration. Instead
just refactor out the code to configure the cache to a new method
and always build a new configuration object.

Change-Id: Ide3359eacb3768fef7cd08b14307e6bdbffb378e
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2011-09-06 16:47:19 -07:00
parent ebf043277d
commit cf6c62366f
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gerrit-server/src/main/java/com/google/gerrit/server/cache/CachePool.java vendored
View File

@@ -22,7 +22,6 @@ import com.google.gerrit.server.config.ConfigUtil;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.SitePaths;
import com.google.inject.Inject;
import com.google.inject.ProvisionException;
import com.google.inject.Singleton;
import net.sf.ehcache.CacheManager;
@@ -214,8 +213,8 @@ public class CachePool {
}
}
private void configureDefaultCache() {
final CacheConfiguration c = new CacheConfiguration();
private CacheConfiguration newConfiguration() {
CacheConfiguration c = new CacheConfiguration();
c.setMaxElementsInMemory(1024);
c.setMemoryStoreEvictionPolicyFromObject(MemoryStoreEvictionPolicy.LFU);
@@ -232,19 +231,17 @@ public class CachePool {
c.setDiskSpoolBufferSizeMB(5);
c.setDiskExpiryThreadIntervalSeconds(60 * 60);
}
return c;
}
mgr.setDefaultCacheConfiguration(c);
private void configureDefaultCache() {
mgr.setDefaultCacheConfiguration(newConfiguration());
}
private CacheConfiguration newCache(final String name) {
try {
final CacheConfiguration c;
c = mgr.getDefaultCacheConfiguration().clone();
c.setName(name);
return c;
} catch (CloneNotSupportedException e) {
throw new ProvisionException("Cannot configure cache " + name, e);
}
CacheConfiguration c = newConfiguration();
c.setName(name);
return c;
}
}
}