Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/ConcurrentCache.java =================================================================== --- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/ConcurrentCache.java (revision 1049925) +++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/ConcurrentCache.java (revision ) @@ -67,7 +67,10 @@ @Override protected boolean removeEldestEntry(Map.Entry> eldest) { if (isTooBig()) { - recordSizeChange(-eldest.getValue().size); + E val = eldest.getValue(); + if (val != null) { + recordSizeChange(-val.size); + } return true; } else { return false;