Merge remote-tracking branch 'origin/master' into jetty-9.1

Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java

1 files changed, 9 insertions, 15 deletions

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/statistic/CounterStatistic.java b/jetty-util/src/main/java/org/eclipse/jetty/util/statistic/CounterStatistic.java
index 67699911c9..51a82ea3bb 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/statistic/CounterStatistic.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/statistic/CounterStatistic.java
@@ -55,37 +55,31 @@ public class CounterStatistic
     /**
      * @param delta the amount to add to the count
      */
-    public void add(final long delta)
+    public long add(final long delta)
     {
         long value=_curr.addAndGet(delta);
         if (delta > 0)
+        {
             _total.addAndGet(delta);
-        Atomics.updateMax(_max,value);
+            Atomics.updateMax(_max,value);
+        }
+        return value;
     }
 
     /* ------------------------------------------------------------ */
     /**
-     * @param delta the amount to subtract the count by.
      */
-    public void subtract(final long delta)
+    public long increment()
     {
-        add(-delta);
+        return add(1);
     }
 
     /* ------------------------------------------------------------ */
     /**
      */
-    public void increment()
+    public long decrement()
     {
-        add(1);
-    }
-
-    /* ------------------------------------------------------------ */
-    /**
-     */
-    public void decrement()
-    {
-        add(-1);
+        return add(-1);
     }
 
     /* ------------------------------------------------------------ */