tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jkemn...@apache.org
Subject tapestry-5 git commit: TAP5-2520: detect another concurrent modification issue
Date Tue, 29 Dec 2015 14:24:29 GMT
Repository: tapestry-5
Updated Branches:
  refs/heads/master bfb24f4b6 -> f12be668d


TAP5-2520: detect another concurrent modification issue


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/f12be668
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/f12be668
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/f12be668

Branch: refs/heads/master
Commit: f12be668de97b53990e75b1f012179ea5b0e6f10
Parents: bfb24f4
Author: Jochen Kemnade <jochen.kemnade@eddyson.de>
Authored: Tue Dec 29 15:23:27 2015 +0100
Committer: Jochen Kemnade <jochen.kemnade@eddyson.de>
Committed: Tue Dec 29 15:23:27 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/f12be668/commons/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java b/commons/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
index 60bec02..4950c16 100644
--- a/commons/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
+++ b/commons/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
@@ -473,6 +473,12 @@ public class CaseInsensitiveMap<V> extends AbstractMap<String,
V> implements Ser
 
             CIMEntry<V> e = entries[cursor];
 
+            if (e == null)
+            {
+                // TAP5-2520
+                throw new ConcurrentModificationException();
+            }
+
             if (e.hashCode < hashCode)
             {
                 low = cursor + 1;


Mime
View raw message