From bb53597cfe3311b4f7f32f279637aa570022d99f Mon Sep 17 00:00:00 2001 From: HadesLee Date: Fri, 21 Mar 2014 09:13:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8DConcurrentModificationExc?= =?UTF-8?q?eption=E7=9A=84=E5=BC=82=E5=B8=B8=EF=BC=8C=E5=BD=93=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E9=87=8F=E6=AF=94=E8=BE=83=E5=A4=A7=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/alibaba/druid/support/http/stat/WebAppStat.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java index b0956e85b5..775d8eb83e 100644 --- a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java +++ b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java @@ -31,6 +31,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; import com.alibaba.druid.util.LRUCache; +import java.util.Collections; public class WebAppStat { @@ -504,7 +505,7 @@ public class WebAppStat { public List> getSessionStatDataList() { List> sessionStatDataList = new ArrayList>(this.sessionStatMap.size()); - for (WebSessionStat sessionStat : this.sessionStatMap.values()) { + for (WebSessionStat sessionStat : Collections.unmodifiableCollection(this.sessionStatMap.values())) { Map sessionStatData = sessionStat.getStatData(); int runningCount = ((Number) sessionStatData.get("RunningCount")).intValue(); @@ -642,7 +643,6 @@ public class WebAppStat { } } else if (isLinux) { osLinuxCount.incrementAndGet(); - isAndroid = computeUserAgentAndroid(userAgent); } else if (userAgent.indexOf("Symbian") != -1) { osSymbianCount.incrementAndGet(); From 4654859ae4612d63be283ba9f79c7ae1ae130dab Mon Sep 17 00:00:00 2001 From: HadesLee Date: Fri, 21 Mar 2014 09:22:03 +0800 Subject: [PATCH 2/3] --- .../java/com/alibaba/druid/support/http/stat/WebAppStat.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java index 775d8eb83e..3034ae9cb7 100644 --- a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java +++ b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java @@ -505,6 +505,7 @@ public class WebAppStat { public List> getSessionStatDataList() { List> sessionStatDataList = new ArrayList>(this.sessionStatMap.size()); + //去除ConcurrentModificationException的异常 for (WebSessionStat sessionStat : Collections.unmodifiableCollection(this.sessionStatMap.values())) { Map sessionStatData = sessionStat.getStatData(); From 0a36a5bed94cc88167eccd81e0fc04c3f82fc6a7 Mon Sep 17 00:00:00 2001 From: hadeslee Date: Fri, 21 Mar 2014 09:24:15 +0800 Subject: [PATCH 3/3] Update WebAppStat.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 去除多余的注释 --- .../java/com/alibaba/druid/support/http/stat/WebAppStat.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java index 3034ae9cb7..775d8eb83e 100644 --- a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java +++ b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java @@ -505,7 +505,6 @@ public class WebAppStat { public List> getSessionStatDataList() { List> sessionStatDataList = new ArrayList>(this.sessionStatMap.size()); - //去除ConcurrentModificationException的异常 for (WebSessionStat sessionStat : Collections.unmodifiableCollection(this.sessionStatMap.values())) { Map sessionStatData = sessionStat.getStatData();