Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

bug fixed for merge WallStats.

Browse Source
This commit is contained in:
wenshao
2016-08-24 05:40:22 +08:00
parent 4d67f283ae
commit e8aecf29bb
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java
+16
View File
@@ -250,6 +250,22 @@ public final class DruidStatManagerFacade {
} else if (valueA instanceof List && valueB instanceof List) {
List<Map<String, Object>> mergedList = mergeNamedList((List) valueA, (List) valueB);
newMap.put(key, mergedList);
} else if (valueA instanceof long[] && valueB instanceof long[]) {
long[] arrayA = (long[]) valueA;
long[] arrayB = (long[]) valueB;
int len = arrayA.length >= arrayB.length ? arrayA.length : arrayB.length;
long[] sum = new long[len];
for (int i = 0; i < sum.length; ++i) {
if (i < arrayA.length) {
sum[i] += arrayA.length;
}
if (i < arrayB.length) {
sum[i] += arrayB.length;
}
}
newMap.put(key, sum);
} else if (valueA instanceof String && valueB instanceof String) {
newMap.put(key, valueA);
} else {