Merged BRANCHES/DEV/THOR1 to HEAD:

30458: ALF-10100: need to be able to apply %age or abs disk space usage constraints on ${dir.cachedcontent}
   30573: ALF-9613: Add min age of files checking to cached content cleaner
   30594: ALF-10100: added more sensible default in sample config for quota size (4GB)
   30695: ALF-10391, ALF-10392: Added MBeans and improved logging for monitoring purposes.
   30850: THOR-202: CachingContentStore quota manager should reject large files
   30901: Added warn-level logging about failure to cache content item
   30951: THOR-217 - when the quota is met or exceeded, then next time the cleaner runs it must use some strategy to make some space.





git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30956 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/content/caching/test/SlowContentStore.java

@@ -65,9 +65,6 @@ class SlowContentStore extends AbstractContentStore
     @Override
     public ContentReader getReader(String contentUrl)
     {
-        urlHits.putIfAbsent(contentUrl, new AtomicLong(0));
-        urlHits.get(contentUrl).incrementAndGet();
-        
         return new SlowReader(contentUrl);
     }
 
@@ -190,6 +187,19 @@ class SlowContentStore extends AbstractContentStore
                 private final byte[] content = "This is the content for my slow ReadableByteChannel".getBytes();
                 private int index = 0;
                 private boolean closed = false;
+                private boolean readCounted = false;
+                
+                private synchronized void registerReadAttempt()
+                {
+                    if (!readCounted)
+                    {
+                        // A true attempt to read from this ContentReader - update statistics.
+                        String url = getContentUrl();
+                        urlHits.putIfAbsent(url, new AtomicLong(0));
+                        urlHits.get(url).incrementAndGet();
+                        readCounted = true;
+                    }
+                }
                 
                 @Override
                 public boolean isOpen()
@@ -206,6 +216,8 @@ class SlowContentStore extends AbstractContentStore
                 @Override
                 public int read(ByteBuffer dst) throws IOException
                 {
+                    registerReadAttempt();
+                    
                     if (index < content.length)
                     {
                         try