Merge branch 'cassandra-2.0' into cassandra-2.1

2014-06-02 23:36:55 -04:00 · 2014-06-02 23:36:55 -04:00 · a899512837
parent e398c6bb89 62d9c43676
commit a899512837
1 changed files with 1 additions and 1 deletions
--- a/src/java/org/apache/cassandra/service/FileCacheService.java
+++ b/src/java/org/apache/cassandra/service/FileCacheService.java
@ -108,7 +108,7 @@ public class FileCacheService
            }
        };

-        cache = CacheBuilder.<String, Queue<RandomAccessReader>>newBuilder()
+        cache = CacheBuilder.newBuilder()
                .expireAfterAccess(AFTER_ACCESS_EXPIRATION, TimeUnit.MILLISECONDS)
                .concurrencyLevel(DatabaseDescriptor.getConcurrentReaders())
                .removalListener(onRemove)