| commit | db2e295826f1619504c2f15a4196344a224f278b | [log] [tgz] |
|---|---|---|
| author | Xander Uiterlinden <uiterlix@apache.org> | Tue Aug 05 09:30:38 2014 +0000 |
| committer | Xander Uiterlinden <uiterlix@apache.org> | Tue Aug 05 09:30:38 2014 +0000 |
| tree | 81005ea41ae25c0ab515e1a293d56aaf6a216cf9 | |
| parent | fbf0d7a3c2018ab8c39f49d3d7856fcb354243f3 [diff] |
FELIX-4597: prevent concurrent modification on registering context and servlet/filter at the same time. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1615899 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java b/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java index 12445be..634cbea 100644 --- a/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java +++ b/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java
@@ -192,8 +192,9 @@ this.idMap.put(id, holder); this.contextMap.put(context, id); - - return holder.getMappings(); + + // return a copy to prevent concurrent modification + return new HashSet<AbstractMapping>(holder.getMappings()); } public synchronized Collection<AbstractMapping> removeHttpContext(HttpContext context)