commit 67a252d99736aeeb99eae5ac18d66e8cfffcdcdc
author Romain Manni-Bucau <rmannibucau@gmail.com> Tue Jun 05 09:46:36 2018 +0200
committer Romain Manni-Bucau <rmannibucau@gmail.com> Tue Jun 05 09:46:36 2018 +0200
tree 9124e3ba865cd637e2bd7940bad0736ac348c851
parent a931ebce10b043a3eb8f8b31895304dea79e05e8

fixing time based stats

pom.xml

diff --git a/pom.xml b/pom.xml
index 8ad58dd..547a3c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
   <properties>
 
     <implementation-groupId>${project.groupId}</implementation-groupId>
-    <implementation-artifactId>commons-jcs</implementation-artifactId>
+    <implementation-artifactId>${project.artifactId}</implementation-artifactId>
     <implementation-version>${project.version}</implementation-version>
 
     <CacheManagerImpl>org.apache.geronimo.jcache.simple.SimpleManager</CacheManagerImpl>

src/main/java/org/apache/geronimo/jcache/simple/SimpleCache.java

diff --git a/src/main/java/org/apache/geronimo/jcache/simple/SimpleCache.java b/src/main/java/org/apache/geronimo/jcache/simple/SimpleCache.java
index 43e49b3..9788a16 100644
--- a/src/main/java/org/apache/geronimo/jcache/simple/SimpleCache.java
+++ b/src/main/java/org/apache/geronimo/jcache/simple/SimpleCache.java
@@ -273,7 +273,7 @@
 
             if (statisticsEnabled) {
                 statistics.increasePuts(1);
-                statistics.addPutTime(System.currentTimeMillis() - start);
+                statistics.addPutTime(Times.now(false) - start);
             }
         } else {
             if (!created) {

src/main/java/org/apache/geronimo/jcache/simple/Statistics.java

diff --git a/src/main/java/org/apache/geronimo/jcache/simple/Statistics.java b/src/main/java/org/apache/geronimo/jcache/simple/Statistics.java
index 3247e2c..ffead32 100644
--- a/src/main/java/org/apache/geronimo/jcache/simple/Statistics.java
+++ b/src/main/java/org/apache/geronimo/jcache/simple/Statistics.java
@@ -113,7 +113,7 @@
             return;
         }
 
-        if (counter.get() < Long.MAX_VALUE - duration) {
+        if (counter.get() + duration < Long.MAX_VALUE) {
             counter.addAndGet(duration);
         } else {
             reset();