Author: jleroux
Date: Thu Aug 10 10:29:08 2017
New Revision: 1804657
URL: http://svn.apache.org/viewvc?rev=1804657&view=rev
Log:
"Applied fix from trunk framework for revision: 1804656 "
------------------------------------------------------------------------
r1804656 | jleroux | 2017-08-10 12:27:57 +0200 (jeu. 10 août 2017) | 7 lignes
Improved: [FB] Package org.apache.ofbiz.base.metrics
(OFBIZ-9567)
Changes a division with two long variables whose result was casted into a double
Now it performs a proper double division
Thanks: Dennis Balkir (and FB ;))
------------------------------------------------------------------------
Modified:
ofbiz/branches/release16.11/ (props changed)
ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/metrics/MetricsFactory.java
Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 10 10:29:08 2017
@@ -10,5 +10,5 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804319
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804319,1804656
/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520
Modified:
ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/metrics/MetricsFactory.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/metrics/MetricsFactory.java?rev=1804657&r1=1804656&r2=1804657&view=diff
==============================================================================
---
ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/metrics/MetricsFactory.java
(original)
+++
ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/metrics/MetricsFactory.java
Thu Aug 10 10:29:08 2017
@@ -133,7 +133,7 @@ public final class MetricsFactory {
* Returns all <code>Metric</code> instances, sorted by name.
*/
public static Collection<Metrics> getMetrics() {
- return new TreeSet<Metrics>(METRICS_CACHE.values());
+ return new TreeSet<>(METRICS_CACHE.values());
}
private static final class MetricsImpl implements Metrics,
Comparable<Metrics> {
@@ -210,7 +210,7 @@ public final class MetricsFactory {
if (totalEvents == 0) {
totalEvents = 1;
}
- double rate = totalServiceTime / totalEvents;
+ double rate = totalServiceTime / (double) totalEvents;
serviceRate = (rate * smoothing) + (serviceRate * (1.0 -
smoothing));
count = 0;
lastTime = curTime;
