Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-13 08:55:44 +01:00
Code Issues Packages Projects Releases Activity

merge with branch 1.x

Browse Source
This commit is contained in:
Sebastian Sdorra
2017-06-25 19:01:33 +02:00
parent b7065bedd1 73cfbe8993
commit aec3d5d65d
81 changed files with 4617 additions and 1319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scm-webapp/src/main/java/sonia/scm/cache/GuavaCache.java vendored
View File

@@ -63,8 +63,7 @@ public class GuavaCache<K, V>
/**
* the logger for GuavaCache
*/
private static final Logger logger =
LoggerFactory.getLogger(GuavaCache.class);
private static final Logger logger = LoggerFactory.getLogger(GuavaCache.class);
//~--- constructors ---------------------------------------------------------
@@ -89,8 +88,7 @@ public class GuavaCache<K, V>
@SuppressWarnings("unchecked")
public GuavaCache(GuavaCacheConfiguration configuration, String name)
{
this(GuavaCaches.create(configuration, name),
configuration.getCopyStrategy(), name);
this(GuavaCaches.create(configuration, name), configuration.getCopyStrategy(), name);
}
/**
@@ -117,7 +115,7 @@ public class GuavaCache<K, V>
this.copyStrategy = CopyStrategy.NONE;
}
}
//~--- methods --------------------------------------------------------------
/**

5
scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheManager.java vendored
View File

@@ -49,7 +49,8 @@ import java.io.IOException;
import java.util.Map;
/**
*
* Guava based implementation of {@link CacheManager} and {@link org.apache.shiro.cache.CacheManager}.
*
* @author Sebastian Sdorra
*/
@Singleton
@@ -57,7 +58,7 @@ public class GuavaCacheManager
implements CacheManager, org.apache.shiro.cache.CacheManager
{
/**
/**
* the logger for GuavaCacheManager
*/
private static final Logger logger =